From 72c7b4eb4cc86ca2f6bdb9e105b67d39df018a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 8 May 2020 18:31:34 +0300 Subject: [PATCH] MDEV-16678 fixup: Remove orphaned DBUG_EXECUTE_IF In commit ea37b144094a0c2ebfc6774047fd473c1b2a8658 we removed the MDEV-16222 test case but forgot to remove the debug instrumentation. --- sql/sql_table.cc | 5 ----- storage/innobase/handler/ha_innodb.cc | 14 -------------- 2 files changed, 19 deletions(-) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 1434e0d61d4..afc397850d4 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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 */ thd->push_internal_handler(&err_handler); error= mysql_rm_table_no_locks(thd, tables, if_exists, drop_temporary, diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 07f5e9dd460..26609b4d713 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -20568,20 +20568,6 @@ ha_innobase::multi_range_read_explain_info( for purge thread */ 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; const bool bg_thread = THDVAR(thd, background_thread);