diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 11:41:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 11:41:18 +0200 |
| commit | 1fd00998390a7487e42f5e29472e99354159c8bc (patch) | |
| tree | 0d8d186d702341695c1ad12236b60b3d0a896354 /sql/sql_table.cc | |
| parent | fa5426ee469a8def705b6653cad4b9d21b4b2741 (diff) | |
| parent | 345356b868d840554a8572876efc027d3ccd9842 (diff) | |
| download | mariadb-git-1fd00998390a7487e42f5e29472e99354159c8bc.tar.gz | |
Merge 10.10 into 10.11
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 0060f179b91..6f3f96d573f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -7672,7 +7672,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, |