Clean up some Galera tests.

dr-m · dr-m · commit b513e3711743 · 2017-02-24T22:13:42.000+02:00
Note: At least one test is unstable, failing with the following:
./mtr --mysqld=--innodb-purge-threads=9 --big-test --no-reorder \
galera.galera_parallel_autoinc_largetrx galera.galera_var_slave_threads

The result difference is dependent on innodb_purge_threads.
diff --git a/mysql-test/suite/galera/r/galera_mdev_10812.result b/mysql-test/suite/galera/r/galera_mdev_10812.result
@@ -2,10 +2,15 @@
 # MDEV-10812: On COM_STMT_CLOSE/COM_QUIT, when wsrep_conflict_state
 # is ABORTED, it causes wrong response to be sent to the client
 #
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 CREATE TABLE t1(a INT PRIMARY KEY);
 INSERT INTO t1 VALUES(1),(2),(3);
 START TRANSACTION ;
 UPDATE t1 SET a=a+100;
+connection node_2;
 UPDATE t1 SET a=a+100;
+connection node_1a;
+disconnect node_1a;
+connection node_2;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_parallel_autoinc_largetrx.result b/mysql-test/suite/galera/r/galera_parallel_autoinc_largetrx.result
@@ -13,16 +13,16 @@ INSERT INTO t1 (f2) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4;;
 connection node_1;
 connection node_1a;
 connection node_2;
-SELECT COUNT(*) = 30000 FROM t1;
-COUNT(*) = 30000
-1
-SELECT COUNT(DISTINCT f1) = 30000 FROM t1;
-COUNT(DISTINCT f1) = 30000
-1
-SELECT COUNT(*) = 5 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+30000
+SELECT COUNT(DISTINCT f1) FROM t1;
+COUNT(DISTINCT f1)
+30000
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
 USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
-COUNT(*) = 5
-1
+COUNT(*)
+5
 connection default;
 DROP TABLE t1;
 DROP TABLE ten;
diff --git a/mysql-test/suite/galera/r/galera_var_certify_nonPK_off.result b/mysql-test/suite/galera/r/galera_var_certify_nonPK_off.result
@@ -24,4 +24,7 @@ connection node_2;
 SET GLOBAL wsrep_certify_nonPK = 1;
 DROP TABLE t1;
 DROP TABLE t2;
+connection node_1;
 call mtr.add_suppression("SQL statement was ineffective");
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/r/galera_var_max_ws_rows.result b/mysql-test/suite/galera/r/galera_var_max_ws_rows.result
@@ -118,12 +118,14 @@ DROP TABLE ten;
 # wsrep_max_ws_rows causes cluster to break when running
 # Galera cluster in TOI mode
 #
+connection node_1;
 CREATE TABLE t1(c1 INT)ENGINE = INNODB;
 SET GLOBAL wsrep_max_ws_rows= DEFAULT;
 INSERT INTO t1 VALUES(1);
 INSERT INTO t1 SELECT * FROM t1;
 SET GLOBAL wsrep_max_ws_rows= 1;
 ALTER TABLE t1 CHANGE COLUMN c1 c1 BIGINT;
+connection node_2;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -133,3 +135,6 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 2
 DROP TABLE t1;
+connection node_1;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/r/galera_var_slave_threads.result b/mysql-test/suite/galera/r/galera_var_slave_threads.result
@@ -12,26 +12,26 @@ SELECT @@wsrep_slave_threads = 1;
 @@wsrep_slave_threads = 1
 1
 SET GLOBAL wsrep_slave_threads = 1;
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
-COUNT(*) = 2
-1
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
-COUNT(*) = 1
+COUNT(*)
+2
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
+COUNT(*)
 1
 SET GLOBAL wsrep_slave_threads = 64;
 connection node_1;
 INSERT INTO t1 VALUES (1);
 connection node_2;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) FROM t1;
+COUNT(*)
 1
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT COUNT(*) - @@wsrep_slave_threads FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
-COUNT(*) = @@wsrep_slave_threads + 1
+COUNT(*) - @@wsrep_slave_threads
 1
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
-COUNT(*) = 1
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
+COUNT(*)
 1
 SET GLOBAL wsrep_slave_threads = 1;
 connection node_1;
@@ -100,15 +100,15 @@ INSERT INTO t2 VALUES (DEFAULT);
 INSERT INTO t2 VALUES (DEFAULT);
 INSERT INTO t2 VALUES (DEFAULT);
 connection node_2;
-SELECT COUNT(*) = 64 FROM t2;
-COUNT(*) = 64
-1
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT COUNT(*) FROM t2;
+COUNT(*)
+64
+SELECT COUNT(*) - @@wsrep_slave_threads FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
-COUNT(*) = @@wsrep_slave_threads + 1
+COUNT(*) - @@wsrep_slave_threads
 1
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
-COUNT(*) = 1
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
+COUNT(*)
 1
 SET GLOBAL wsrep_slave_threads = 1;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test b/mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test
@@ -37,9 +37,9 @@ SET GLOBAL wsrep_slave_threads = 4;
 
 --connection node_2
 --reap
-SELECT COUNT(*) = 30000 FROM t1;
-SELECT COUNT(DISTINCT f1) = 30000 FROM t1;
-SELECT COUNT(*) = 5 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(DISTINCT f1) FROM t1;
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
   USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 
 --disable_query_log
diff --git a/mysql-test/suite/galera/t/galera_var_slave_threads.test b/mysql-test/suite/galera/t/galera_var_slave_threads.test
@@ -22,9 +22,9 @@ SELECT @@wsrep_slave_threads = 1;
 
 SET GLOBAL wsrep_slave_threads = 1;
 # There is a separate wsrep_aborter thread at all times
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
   WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 
 #
 # Increase the number of slave threads. The change takes effect immediately
@@ -37,11 +37,11 @@ SET GLOBAL wsrep_slave_threads = 64;
 INSERT INTO t1 VALUES (1);
 
 --connection node_2
-SELECT COUNT(*) = 1 FROM t1;
+SELECT COUNT(*) FROM t1;
 
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT COUNT(*) - @@wsrep_slave_threads FROM INFORMATION_SCHEMA.PROCESSLIST
   WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 
 #
 # Reduce the number of slave threads. The change is not immediate -- a thread will only exit after a replication event
@@ -60,11 +60,11 @@ while ($count)
 }
 
 --connection node_2
-SELECT COUNT(*) = 64 FROM t2;
+SELECT COUNT(*) FROM t2;
 
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT COUNT(*) - @@wsrep_slave_threads FROM INFORMATION_SCHEMA.PROCESSLIST
   WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 
 
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig
