[Commits] b91a4103f6f: MDEV-13549: Galera test failures

jan jan.lindstrom at mariadb.com
Fri Apr 6 12:36:32 EEST 2018


revision-id: b91a4103f6f1d33f9ce83fcd7166a95ec54e7a18 (mariadb-10.1.32-29-gb91a4103f6f)
parent(s): d61ed5dd8a7e63cebf52efc2d067706263df2061
author: Jan Lindström
committer: Jan Lindström
timestamp: 2018-04-06 12:35:25 +0300
message:

MDEV-13549: Galera test failures

Fix test case galera_toi_ddl_nonconflicting as we need to wait
until both alter tables are finished on that Galera node.

---
 mysql-test/suite/galera/t/galera_toi_ddl_nonconflicting.test | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mysql-test/suite/galera/t/galera_toi_ddl_nonconflicting.test b/mysql-test/suite/galera/t/galera_toi_ddl_nonconflicting.test
index 821f7a6eb2c..dbd2510cba3 100644
--- a/mysql-test/suite/galera/t/galera_toi_ddl_nonconflicting.test
+++ b/mysql-test/suite/galera/t/galera_toi_ddl_nonconflicting.test
@@ -17,12 +17,23 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
 --reap
 INSERT INTO t1 (f1, f2) VALUES (DEFAULT, 234);
 
+--let $wait_condition = SELECT COUNT(*) = 3 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+--let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+
 SELECT COUNT(*) = 3 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
 SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_NAME = 't1';
 SELECT COUNT(*) = 2 FROM t1;
 
 --connection node_1
 --reap
+
+--let $wait_condition = SELECT COUNT(*) = 3 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+--let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+
 SELECT COUNT(*) = 3 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
 SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_NAME = 't1';
 SELECT COUNT(*) = 2 FROM t1;


More information about the commits mailing list