diff options
| author | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2023-02-10 14:44:45 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2023-02-10 14:44:45 +0200 |
| commit | c7fba948e133b20ca2e24aa30e59e80ae190bc45 (patch) | |
| tree | 7011e4e6b080a22cb44e8388e58cc136a331bda1 | |
| parent | dbab3e8d90e82aead7f3b504784a1334fda69b1d (diff) | |
| download | mariadb-git-c7fba948e133b20ca2e24aa30e59e80ae190bc45.tar.gz | |
Fix RPL tests post DEBUG_SYNC change
The tests expect the SIGNAL to not be cleared. Thus set NO_CLEAR_EVENT
within DBUG_EXECUTE_IF
| -rw-r--r-- | mysql-test/suite/rpl/disabled.def | 11 | ||||
| -rw-r--r-- | sql/sql_table.cc | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/mysql-test/suite/rpl/disabled.def b/mysql-test/suite/rpl/disabled.def index 860afb147c8..57907210693 100644 --- a/mysql-test/suite/rpl/disabled.def +++ b/mysql-test/suite/rpl/disabled.def @@ -15,14 +15,3 @@ rpl_row_binlog_max_cache_size : MDEV-11092 rpl_row_index_choice : MDEV-11666 rpl_auto_increment_update_failure : disabled for now rpl_current_user : waits for MDEV-22374 fix -rpl_start_alter_1 : DEBUG_SYNC timeout -rpl_start_alter_2 : DEBUG_SYNC timeout -rpl_start_alter_3 : DEBUG_SYNC timeout -rpl_start_alter_4 : DEBUG_SYNC timeout -rpl_start_alter_5 : DEBUG_SYNC timeout -rpl_start_alter_6 : DEBUG_SYNC timeout -rpl_start_alter_7 : DEBUG_SYNC timeout -rpl_start_alter_8 : DEBUG_SYNC timeout -rpl_start_alter_mysqlbinlog_1 : DEBUG_SYNC timeout -rpl_start_alter_mysqlbinlog_2 : DEBUG_SYNC timeout -rpl_start_alter_restart_slave : DEBUG_SYNC timeout diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 529b0461f92..acd15d3f911 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -7675,7 +7675,7 @@ static bool mysql_inplace_alter_table(THD *thd, THD_STAGE_INFO(thd, stage_alter_inplace); DBUG_EXECUTE_IF("start_alter_delay_master", { debug_sync_set_action(thd, - STRING_WITH_LEN("now wait_for alter_cont")); + STRING_WITH_LEN("now wait_for alter_cont NO_CLEAR_EVENT")); }); /* We can abort alter table for any table type */ @@ -10856,7 +10856,7 @@ do_continue:; DBUG_EXECUTE_IF("start_alter_delay_master", { debug_sync_set_action(thd, - STRING_WITH_LEN("now wait_for alter_cont")); + STRING_WITH_LEN("now wait_for alter_cont NO_CLEAR_EVENT")); }); // It's now safe to take the table level lock. if (lock_tables(thd, table_list, alter_ctx.tables_opened, |