diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 10:25:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 10:25:34 +0200 |
| commit | 0d55914d968fcc557d4429a37c61fbdedd9352a6 (patch) | |
| tree | c119f75d1aac283025ff379b07cab78b6d8b384d /sql/sql_table.cc | |
| parent | 37a46e21815fe1176d211a89283d9bc17fcd39db (diff) | |
| parent | b12cd88ce177b475066734b06c1e3a4445a62d86 (diff) | |
| download | mariadb-git-0d55914d968fcc557d4429a37c61fbdedd9352a6.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 2d1010bffac..5fc564e73b8 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -7673,7 +7673,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 */ @@ -10857,7 +10857,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, |