Skip to content
Permalink
Browse files
MDEV-25730: maria.repair test fails with valgrind
cherry-pick commit: 1fff239
MDEV-22530 post push fixes from 10.6.

Followup. If the KILL happens - report it as a failure,
don't eat it up silently. Note that this has to be done after `table_name`
is populated, so that the error message could show it.
  • Loading branch information
vuvova authored and sujatha-s committed May 25, 2021
1 parent fe7e44d commit d8fa71a
Showing 1 changed file with 7 additions and 2 deletions.
@@ -499,8 +499,6 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
DBUG_PRINT("admin", ("table: '%s'.'%s'", table->db, table->table_name));
DEBUG_SYNC(thd, "admin_command_kill_before_modify");

if (thd->is_killed())
break;
strxmov(table_name, db, ".", table->table_name, NullS);
thd->open_options|= extra_open_options;
table->lock_type= lock_type;
@@ -515,6 +513,13 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
: lock_type >= TL_WRITE_ALLOW_WRITE
? MDL_SHARED_WRITE : MDL_SHARED_READ);

if (thd->check_killed())
{
fatal_error= true;
result_code= HA_ADMIN_FAILED;
goto send_result;
}

/* open only one table from local list of command */
while (1)
{

0 comments on commit d8fa71a

Please sign in to comment.