diff options
| author | Monty <monty@mariadb.org> | 2020-04-18 11:51:21 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-04-18 12:33:12 +0300 |
| commit | 36bddacf6b9177587eb5364e81f42a482df7d73f (patch) | |
| tree | 94f8856cff7a25c65c251964ec49b73ff812e45e | |
| parent | 0bcb65d358087bf94e217254f812f913343a6f5d (diff) | |
| download | mariadb-git-36bddacf6b9177587eb5364e81f42a482df7d73f.tar.gz | |
Fixed multi_update_debug.test
Backported fix from 10.5
| -rw-r--r-- | mysql-test/r/multi_update_debug.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/multi_update_debug.test | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/multi_update_debug.result b/mysql-test/r/multi_update_debug.result index 799b6821e48..8649172d0c9 100644 --- a/mysql-test/r/multi_update_debug.result +++ b/mysql-test/r/multi_update_debug.result @@ -5,9 +5,10 @@ insert t2 values (5,6),(7,8); create table t0 (x int); insert t0 values (11), (22); create trigger tr1 before update on t1 for each row insert t0 values (new.b); -set debug_sync='open_tables_after_open_and_process_table WAIT_FOR cont'; +set debug_sync='open_tables_after_open_and_process_table SIGNAL ready WAIT_FOR cont'; update t1 join t2 on (a=c+4) set b=d; connect con1, localhost, root; +set debug_sync='now WAIT_FOR ready'; set debug_sync='mdl_acquire_lock_wait SIGNAL cont'; lock table t1 write, t0 write; disconnect con1; diff --git a/mysql-test/t/multi_update_debug.test b/mysql-test/t/multi_update_debug.test index 2da376e1b87..479405124b0 100644 --- a/mysql-test/t/multi_update_debug.test +++ b/mysql-test/t/multi_update_debug.test @@ -10,12 +10,11 @@ create table t0 (x int); insert t0 values (11), (22); create trigger tr1 before update on t1 for each row insert t0 values (new.b); -set debug_sync='open_tables_after_open_and_process_table WAIT_FOR cont'; +set debug_sync='open_tables_after_open_and_process_table SIGNAL ready WAIT_FOR cont'; send update t1 join t2 on (a=c+4) set b=d; connect con1, localhost, root; -let $wait_condition= select count(*) from information_schema.processlist where state = ' debug sync point: open_tables_after_open_and_process_table' -source include/wait_condition.inc; +set debug_sync='now WAIT_FOR ready'; set debug_sync='mdl_acquire_lock_wait SIGNAL cont'; lock table t1 write, t0 write; let $wait_condition= select count(*) from information_schema.processlist where state = 'Waiting for table metadata lock' |