diff options
Diffstat (limited to 'mysql-test/main/alter_table_online_debug.test')
| -rw-r--r-- | mysql-test/main/alter_table_online_debug.test | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/main/alter_table_online_debug.test b/mysql-test/main/alter_table_online_debug.test index 5b4fe1f3724..7ab4031f77c 100644 --- a/mysql-test/main/alter_table_online_debug.test +++ b/mysql-test/main/alter_table_online_debug.test @@ -43,11 +43,10 @@ insert t1 values (5), (5); set debug_sync= 'now WAIT_FOR ended'; --connection default -set session lock_wait_timeout=1; set debug_sync= 'alter_table_copy_end SIGNAL ended WAIT_FOR end'; --send -alter table t1 add unique (a), algorithm= copy, lock= none; +alter table t1 nowait add unique (a), algorithm= copy, lock= none; --connection con2 --reap @@ -64,7 +63,6 @@ commit; select variable_value into @otd from information_schema.session_status where variable_name='Opened_table_definitions'; select * from t1; select variable_value-@otd from information_schema.session_status where variable_name='Opened_table_definitions'; -set session lock_wait_timeout=default; --echo # long transaction and add column create or replace table t1 (a int); @@ -76,9 +74,8 @@ set debug_sync= 'now WAIT_FOR ended'; --connection default set debug_sync= 'alter_table_copy_end SIGNAL ended WAIT_FOR end'; -set session lock_wait_timeout=1; --send -alter table t1 add b int NULL, algorithm= copy, lock= none; +alter table t1 nowait add b int NULL, algorithm= copy, lock= none; --connection con2 --reap @@ -90,7 +87,6 @@ set debug_sync= 'now SIGNAL end'; --error ER_LOCK_WAIT_TIMEOUT --reap select * from t1; -set session lock_wait_timeout=default; --connection con2 rollback; --connection default @@ -732,12 +728,12 @@ insert into t1 values (1),(2),(3); set sql_mode='STRICT_TRANS_TABLES,STRICT_ALL_TABLES'; set debug_sync= 'alter_table_online_downgraded signal downgraded wait_for goforit'; --send alter table t1 modify a int not null, algorithm=copy, lock=none - + --connection default --reap insert into t1 values (null),(null); set debug_sync= 'now signal goforit'; - + --connection con2 --error WARN_DATA_TRUNCATED --reap |