database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix RPL tests post DEBUG_SYNC change

Browse Source 
The tests expect the SIGNAL to not be cleared. Thus set NO_CLEAR_EVENT
within DBUG_EXECUTE_IF
This commit is contained in:
Vicențiu Ciorbaru
2023-02-10 14:44:45 +02:00
parent dbab3e8d90
commit c7fba948e1
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/rpl/disabled.def
View File

@ -15,14 +15,3 @@ rpl_row_binlog_max_cache_size : MDEV-11092
rpl_row_index_choice : MDEV-11666 rpl_row_index_choice : MDEV-11666
rpl_auto_increment_update_failure : disabled for now rpl_auto_increment_update_failure : disabled for now
rpl_current_user : waits for MDEV-22374 fix 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

4
sql/sql_table.cc
View File

@ -7675,7 +7675,7 @@ static bool mysql_inplace_alter_table(THD *thd,
THD_STAGE_INFO(thd, stage_alter_inplace); THD_STAGE_INFO(thd, stage_alter_inplace);
DBUG_EXECUTE_IF("start_alter_delay_master", { DBUG_EXECUTE_IF("start_alter_delay_master", {
debug_sync_set_action(thd, 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 */ /* We can abort alter table for any table type */
@ -10856,7 +10856,7 @@ do_continue:;
DBUG_EXECUTE_IF("start_alter_delay_master", { DBUG_EXECUTE_IF("start_alter_delay_master", {
debug_sync_set_action(thd, 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. // It's now safe to take the table level lock.
if (lock_tables(thd, table_list, alter_ctx.tables_opened, if (lock_tables(thd, table_list, alter_ctx.tables_opened,