[Commits] 1568950a7d0: MDEV-15806: Test failure on galera.galera_parallel_simple

jan jan.lindstrom at mariadb.com
Sun Apr 8 09:04:44 EEST 2018


revision-id: 1568950a7d0d4f184af6a8779d820d0100170529 (mariadb-10.1.32-39-g1568950a7d0)
parent(s): c4b1a57b131e767955aaf85170039977200c050d
author: Jan Lindström
committer: Jan Lindström
timestamp: 2018-04-08 09:03:55 +0300
message:

MDEV-15806: Test failure on galera.galera_parallel_simple

Make sure DDL's (create tables) are replicated before continuing to
lock table.

---
 mysql-test/suite/galera/disabled.def                    | 1 -
 mysql-test/suite/galera/r/galera_parallel_simple.result | 4 ++++
 mysql-test/suite/galera/t/galera_parallel_simple.test   | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 3388d2328ca..cfee87d9686 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -31,4 +31,3 @@ galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry
 galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on
 pxc-421 : MDEV-15804 Test failure on galera.pxc-421
 query_cache : MDEV-15805 Test failure on galera.query_cache
-galera_parallel_simple : MDEV-15806 Test failure on galera.galera_parallel_simple
\ No newline at end of file
diff --git a/mysql-test/suite/galera/r/galera_parallel_simple.result b/mysql-test/suite/galera/r/galera_parallel_simple.result
index 3b10815c63d..0b19ef7da8f 100644
--- a/mysql-test/suite/galera/r/galera_parallel_simple.result
+++ b/mysql-test/suite/galera/r/galera_parallel_simple.result
@@ -1,6 +1,10 @@
 CREATE TABLE t1 (id INT) ENGINE=InnoDB;
 CREATE TABLE t2 (id INT) ENGINE=InnoDB;
 SET GLOBAL wsrep_slave_threads = 2;
+SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';
+NAME
+test/t1
+test/t2
 LOCK TABLE t1 WRITE;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
diff --git a/mysql-test/suite/galera/t/galera_parallel_simple.test b/mysql-test/suite/galera/t/galera_parallel_simple.test
index 41cd0c8e6fa..2cd840123cf 100644
--- a/mysql-test/suite/galera/t/galera_parallel_simple.test
+++ b/mysql-test/suite/galera/t/galera_parallel_simple.test
@@ -13,6 +13,13 @@ CREATE TABLE t2 (id INT) ENGINE=InnoDB;
 
 --connection node_2
 SET GLOBAL wsrep_slave_threads = 2;
+
+# Wait until above DDL's are replicated
+--let $wait_condition = SELECT COUNT(*) = 2 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%';
+
 LOCK TABLE t1 WRITE;
 
 --connection node_1


More information about the commits mailing list