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

Merge 10.9 into 10.10

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-16 11:36:38 +02:00
parent 7aace5d5da 0d55914d96
commit 345356b868
326 changed files with 2897 additions and 1774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -7671,7 +7671,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 */
@ -10855,7 +10855,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,