diff --git a/mysql-test/main/alter_table_online_debug.result b/mysql-test/main/alter_table_online_debug.result index fcb665817ea..4a9265c5681 100644 --- a/mysql-test/main/alter_table_online_debug.result +++ b/mysql-test/main/alter_table_online_debug.result @@ -1813,20 +1813,18 @@ insert into t select seq, seq from seq_1_to_5; backup stage start; connect con_lock,localhost,root,,; set lock_wait_timeout= 1; -set debug_sync='copy_data_between_tables_before_reset_backup_lock wait_for continue'; +set debug_sync='copy_data_between_tables_before_reset_backup_lock signal backup wait_for continue'; alter table t add index (b), algorithm=copy, lock=none; connection default; +set debug_sync='now wait_for backup'; backup stage block_commit; set debug_sync='now signal continue'; connection con_lock; ERROR HY000: Lock wait timeout exceeded; try restarting transaction -set debug_sync='copy_data_between_tables_before_reset_backup_lock wait_for continue'; -alter table t add index (a), algorithm=copy, lock=none; +disconnect con_lock; connection default; backup stage end; -set debug_sync='now signal continue'; -connection con_lock; -disconnect con_lock; +alter table t add index (a), algorithm=copy, lock=none; connection default; drop table t; set global default_storage_engine= MyISAM; diff --git a/mysql-test/main/alter_table_online_debug.test b/mysql-test/main/alter_table_online_debug.test index c1e829392fc..64b73157a2f 100644 --- a/mysql-test/main/alter_table_online_debug.test +++ b/mysql-test/main/alter_table_online_debug.test @@ -2074,10 +2074,13 @@ backup stage start; --connect (con_lock,localhost,root,,) set lock_wait_timeout= 1; -set debug_sync='copy_data_between_tables_before_reset_backup_lock wait_for continue'; +set debug_sync='copy_data_between_tables_before_reset_backup_lock signal backup wait_for continue'; send alter table t add index (b), algorithm=copy, lock=none; --connection default + +set debug_sync='now wait_for backup'; + backup stage block_commit; set debug_sync='now signal continue'; @@ -2085,18 +2088,12 @@ set debug_sync='now signal continue'; --connection con_lock --error ER_LOCK_WAIT_TIMEOUT --reap -# --echo # error $mysql_errno - -set debug_sync='copy_data_between_tables_before_reset_backup_lock wait_for continue'; -send alter table t add index (a), algorithm=copy, lock=none; +--disconnect con_lock --connection default backup stage end; -set debug_sync='now signal continue'; +alter table t add index (a), algorithm=copy, lock=none; ---connection con_lock ---reap ---disconnect con_lock --connection default drop table t;