summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-03-16 17:49:44 +0200
committerMonty <monty@mariadb.org>2020-03-16 17:49:44 +0200
commit2e0277373dd1ab0131b71e77c293d1998c879470 (patch)
treed2bce565c36a9c28474df79d170cc4a984e209db
parentc7daabdb0579531a22c24697f9efbe2ea2759435 (diff)
downloadmariadb-git-2e0277373dd1ab0131b71e77c293d1998c879470.tar.gz
Fixed multi_update_debug.test
This should fix the following failure: + Warnings: + Warning 1639 debug sync point wait timed out
-rw-r--r--mysql-test/main/multi_update_debug.result3
-rw-r--r--mysql-test/main/multi_update_debug.test5
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/multi_update_debug.result b/mysql-test/main/multi_update_debug.result
index 799b6821e48..8649172d0c9 100644
--- a/mysql-test/main/multi_update_debug.result
+++ b/mysql-test/main/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/main/multi_update_debug.test b/mysql-test/main/multi_update_debug.test
index 2da376e1b87..479405124b0 100644
--- a/mysql-test/main/multi_update_debug.test
+++ b/mysql-test/main/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'