mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
fix race in the MDEV-32614 test
Sometimes 'continue' signal could be missed.
This commit is contained in:
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user