1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-16678 fixup: Remove orphaned DBUG_EXECUTE_IF

Browse Source 
In commit ea37b144094a0c2ebfc6774047fd473c1b2a8658
we removed the MDEV-16222 test case but forgot to remove
the debug instrumentation.
This commit is contained in:
Marko Mäkelä 2020-05-08 18:31:34 +03:00
parent 4a5be2e94e
commit 72c7b4eb4c
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -2132,11 +2132,6 @@ bool mysql_rm_table(THD *thd,TABLE_LIST *tables, bool if_exists,
} }
} }
DBUG_EXECUTE_IF("ib_purge_virtual_mdev_16222_1",
DBUG_ASSERT(!debug_sync_set_action(
thd,
STRING_WITH_LEN("now SIGNAL drop_started"))););
/* mark for close and remove all cached entries */ /* mark for close and remove all cached entries */
thd->push_internal_handler(&err_handler); thd->push_internal_handler(&err_handler);
error= mysql_rm_table_no_locks(thd, tables, if_exists, drop_temporary, error= mysql_rm_table_no_locks(thd, tables, if_exists, drop_temporary,

14
storage/innobase/handler/ha_innodb.cc
View File

@ -20568,20 +20568,6 @@ ha_innobase::multi_range_read_explain_info(
for purge thread */ for purge thread */
static TABLE* innodb_find_table_for_vc(THD* thd, dict_table_t* table) static TABLE* innodb_find_table_for_vc(THD* thd, dict_table_t* table)
{ {
DBUG_EXECUTE_IF(
"ib_purge_virtual_mdev_16222_1",
DBUG_ASSERT(!debug_sync_set_action(
thd,
STRING_WITH_LEN("ib_purge_virtual_latch_released "
"SIGNAL latch_released "
"WAIT_FOR drop_started"))););
DBUG_EXECUTE_IF(
"ib_purge_virtual_mdev_16222_2",
DBUG_ASSERT(!debug_sync_set_action(
thd,
STRING_WITH_LEN("ib_purge_virtual_got_no_such_table "
"SIGNAL got_no_such_table"))););
TABLE *mysql_table; TABLE *mysql_table;
const bool bg_thread = THDVAR(thd, background_thread); const bool bg_thread = THDVAR(thd, background_thread);