MDEV-15823: Test failure on galera.galera_var_slave_threads

Jan Lindström · Jan Lindström · commit 1fd07d21a72c · 2018-04-10T13:25:19.000+03:00
Wait drop table to be replicated before continuing.
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
@@ -34,4 +34,3 @@ query_cache : MDEV-15805 Test failure on galera.query_cache
 galera.galera_gra_log : MDEV-15808 Test failure on galera.galera_gra_log
 galera.MW-44 : MDEV-15809 Test failure on galera.MW-44
 galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb
-galera.galera_var_slave_threads : MDEV-15785 Test failure on galera.galera_var_slave_threads
diff --git a/mysql-test/suite/galera/r/galera_var_slave_threads.result b/mysql-test/suite/galera/r/galera_var_slave_threads.result
@@ -109,6 +109,8 @@ INSERT INTO t1 VALUES (DEFAULT);
 INSERT INTO t1 VALUES (DEFAULT);
 INSERT INTO t1 VALUES (DEFAULT);
 DROP TABLE t1;
+SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';
+NAME
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 COUNT(*) = 1
 1
diff --git a/mysql-test/suite/galera/t/galera_var_slave_threads.test b/mysql-test/suite/galera/t/galera_var_slave_threads.test
@@ -88,6 +88,13 @@ INSERT INTO t1 VALUES (DEFAULT);
 DROP TABLE t1;
 
 --connection node_2
+
+# Wait until above DDL is replicated
+--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';
+--source include/wait_condition.inc
+
+SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';
+
 #
 # make sure that we are left with exactly one applier thread before we leaving the test
 #

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ INSERT INTO t1 VALUES (DEFAULT);`
`109`	`109`	`INSERT INTO t1 VALUES (DEFAULT);`
`110`	`110`	`INSERT INTO t1 VALUES (DEFAULT);`
`111`	`111`	`DROP TABLE t1;`
	`112`	`+SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';`
	`113`	`+NAME`
`112`	`114`	`SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';`
`113`	`115`	`COUNT(*) = 1`
`114`	`116`	`1`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,13 @@ INSERT INTO t1 VALUES (DEFAULT);`
`88`	`88`	`DROP TABLE t1;`
`89`	`89`
`90`	`90`	`--connection node_2`
	`91`	`+`
	`92`	`+# Wait until above DDL is replicated`
	`93`	`+--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';`
	`94`	`+--source include/wait_condition.inc`
	`95`	`+`
	`96`	`+SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';`
	`97`	`+`
`91`	`98`	`#`
`92`	`99`	`# make sure that we are left with exactly one applier thread before we leaving the test`
`93`	`100`	`#`