Update test results in galera, galera_3nodes suites.

Nirbhay Choubey · Nirbhay Choubey · commit d5e6d8379d0b · 2016-11-07T11:53:58.000-05:00
diff --git a/mysql-test/suite/galera/r/GAL-382.result b/mysql-test/suite/galera/r/GAL-382.result
@@ -1,3 +1,4 @@
+connection node_1;
 create table t1 (i int, j int, k int, primary key pk(i)) engine=innodb;
 insert into t1 values (1, 1, 1), (2, 2, 2), (3, 3, 3);
 create table t2 (i int, j int, k int, primary key pk(i, j, k), index idx(i, k, j)) engine=innodb;
diff --git a/mysql-test/suite/galera/r/MW-252.result b/mysql-test/suite/galera/r/MW-252.result
@@ -1,7 +1,10 @@
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 FLUSH TABLES WITH READ LOCK;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
+connection node_2;
+connection node_1;
 UNLOCK TABLES;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result
@@ -1,5 +1,8 @@
+connection node_1;
 TRUNCATE TABLE mysql.general_log;
+connection node_2;
 TRUNCATE TABLE mysql.general_log;
+connection node_1;
 SET SESSION wsrep_osu_method=TOI;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 SET SESSION wsrep_osu_method=RSU;
@@ -8,6 +11,7 @@ SET SESSION wsrep_osu_method=TOI;
 SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%';
 COUNT(*) = 2
 1
+connection node_2;
 SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
 COUNT(*) = 0
 1
diff --git a/mysql-test/suite/galera/r/enforce_storage_engine2.result b/mysql-test/suite/galera/r/enforce_storage_engine2.result
@@ -2,10 +2,12 @@
 # MDEV-9312: storage engine not enforced during galera cluster
 # replication
 #
+connection node_1;
 CREATE TABLE t1(i INT) ENGINE=INNODB;
 CREATE TABLE t2(i INT) ENGINE=MYISAM;
 Warnings:
 Note	1266	Using storage engine InnoDB for table 't2'
+connection node_2;
 SHOW TABLES;
 Tables_in_test
 t1
diff --git a/mysql-test/suite/galera/r/galera_as_slave_autoinc.result b/mysql-test/suite/galera/r/galera_as_slave_autoinc.result
@@ -1,4 +1,7 @@
+connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
+connection node_2;
 START SLAVE;
+connection node_1;
 SET SESSION binlog_format='STATEMENT';
 CREATE TABLE t1 (
 i int(11) NOT NULL AUTO_INCREMENT,
@@ -40,6 +43,7 @@ Variable_name	Value
 auto_increment_increment	7
 auto_increment_offset	5
 wsrep_auto_increment_control	ON
+connection node_2;
 select * from t1;
 i	c
 1	dummy_text
@@ -58,6 +62,7 @@ binlog_format	ROW
 show variables like 'auto_increment_increment';
 Variable_name	Value
 auto_increment_increment	2
+connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 select * from t1;
 i	c
 1	dummy_text
@@ -76,7 +81,10 @@ binlog_format	ROW
 show variables like 'auto_increment_increment';
 Variable_name	Value
 auto_increment_increment	2
+connection node_1;
 DROP TABLE t1;
+connection node_2;
 STOP SLAVE;
 RESET SLAVE ALL;
+connection node_1;
 RESET MASTER;
diff --git a/mysql-test/suite/galera/r/galera_kill_ddl.result b/mysql-test/suite/galera/r/galera_kill_ddl.result
@@ -11,7 +11,4 @@ SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
 COUNT(*) = 2
 1
 connection node_1;
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 2
-1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result
@@ -16,3 +16,5 @@ VARIABLE_VALUE = 'ON'
 1
 SET GLOBAL wsrep_cluster_address = '';
 connection node_2;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/r/galera_restart_nochanges.result b/mysql-test/suite/galera/r/galera_restart_nochanges.result
@@ -4,6 +4,7 @@ connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
+connection node_1;
 connection node_2a;
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
@@ -12,3 +13,5 @@ SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_N
 VARIABLE_VALUE = 2
 1
 DROP TABLE t1;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/r/galera_roles.result b/mysql-test/suite/galera/r/galera_roles.result
@@ -171,6 +171,7 @@ DROP DATABASE test1;
 #
 
 # On node_1
+connection node_1;
 CREATE USER foo@localhost;
 CREATE ROLE role1;
 CREATE ROLE role2 WITH ADMIN CURRENT_USER;
@@ -189,6 +190,7 @@ root@localhost	role1	YES	NO
 root@localhost	role2	YES	NO
 
 # On node_2
+connection node_2;
 SELECT * FROM mysql.roles_mapping;
 Host	User	Role	Admin_option
 	role1	role4	Y
diff --git a/mysql-test/suite/galera/r/galera_split_brain.result b/mysql-test/suite/galera/r/galera_split_brain.result
@@ -1,11 +1,13 @@
-call mtr.add_suppression("WSREP: TO isolation failed for: ");
-connection node_1;
 connection node_1;
 connection node_2;
+call mtr.add_suppression("WSREP: TO isolation failed for: ");
+connection node_1;
 connection node_2;
 Killing server ...
 connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 SET GLOBAL wsrep_cluster_address = '';
 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/r/galera_var_desync_on.result b/mysql-test/suite/galera/r/galera_var_desync_on.result
@@ -33,4 +33,5 @@ COUNT(*) = 11
 1
 CALL mtr.add_suppression("Protocol violation");
 DROP TABLE t1;
+connection node_1;
 CALL mtr.add_suppression("Protocol violation");
diff --git a/mysql-test/suite/galera/r/galera_var_dirty_reads.result b/mysql-test/suite/galera/r/galera_var_dirty_reads.result
@@ -1,3 +1,5 @@
+connection node_1;
+connection node_2;
 connection node_2;
 CREATE TABLE t1(i INT) ENGINE=INNODB;
 INSERT INTO t1 VALUES(1);
diff --git a/mysql-test/suite/galera/r/mdev_10518.result b/mysql-test/suite/galera/r/mdev_10518.result
@@ -1,4 +1,5 @@
 # On node_1
+connection node_1;
 list of GTID variables :
 gtid_domain_id	1
 gtid_binlog_pos	
@@ -8,6 +9,7 @@ gtid_slave_pos
 wsrep_gtid_domain_id	4294967295
 wsrep_gtid_mode	1
 # On node_2
+connection node_2;
 list of GTID variables :
 gtid_domain_id	2
 gtid_binlog_pos	
@@ -17,6 +19,7 @@ gtid_slave_pos
 wsrep_gtid_domain_id	4294967295
 wsrep_gtid_mode	1
 # On node_1
+connection node_1;
 CREATE TABLE t1(i INT) ENGINE=INNODB;
 CREATE TABLE t2(i INT) ENGINE=MEMORY;
 INSERT INTO t1 VALUES(1);
@@ -34,6 +37,7 @@ gtid_slave_pos
 wsrep_gtid_domain_id	4294967295
 wsrep_gtid_mode	1
 # On node_2
+connection node_2;
 SELECT * FROM t1;
 i
 1
@@ -46,6 +50,7 @@ gtid_slave_pos
 wsrep_gtid_domain_id	4294967295
 wsrep_gtid_mode	1
 # On node_1
+connection node_1;
 INSERT INTO t2 VALUES(1);
 SELECT * FROM t2;
 i
@@ -59,6 +64,7 @@ gtid_slave_pos
 wsrep_gtid_domain_id	4294967295
 wsrep_gtid_mode	1
 # On node_2
+connection node_2;
 SELECT * FROM t2;
 i
 list of GTID variables :
@@ -70,5 +76,8 @@ gtid_slave_pos
 wsrep_gtid_domain_id	4294967295
 wsrep_gtid_mode	1
 # On node_1
+connection node_1;
 DROP TABLE t1, t2;
+disconnect node_2;
+disconnect node_1;
 # End of test
diff --git a/mysql-test/suite/galera/r/mysql-wsrep#31.result b/mysql-test/suite/galera/r/mysql-wsrep#31.result
@@ -1,4 +1,6 @@
 connection node_1;
+connection node_2;
+connection node_1;
 CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES('test');
 CREATE DATABASE db;
@@ -11,3 +13,6 @@ Using --wsrep-start-position when starting mysqld ...
 connection node_1;
 DROP TABLE t1;
 DROP DATABASE db;
+connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result b/mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result
@@ -1,17 +1,28 @@
+connection node_1;
+connection node_2;
+connection node_3;
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 3
 1
+connection node_3;
 SET GLOBAL wsrep_cluster_address = '';
+connection node_1;
 INSERT INTO t1 VALUES (2);
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
 COMMIT;
+connection node_2;
 SELECT COUNT(*) = 2 FROM t1;
 COUNT(*) = 2
 1
+connection node_3;
+connection node_1;
 DROP TABLE t1;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_certification_double_failure.result b/mysql-test/suite/galera_3nodes/r/galera_certification_double_failure.result
@@ -1,11 +1,15 @@
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
+connection node_2;
 INSERT INTO t1 VALUES (1);
+connection node_3;
 INSERT INTO t2 VALUES (1);
+connection node_1;
 COMMIT;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result b/mysql-test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result
@@ -1,8 +1,14 @@
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
+connection node_3;
 SET GLOBAL wsrep_slave_threads = 2;
+connection node_1;
 UPDATE t1 SET f1 = f1 + 10;;
+connection node_2;
 UPDATE t1 SET f1 = f1 + 100;;
+connection node_1;
+connection node_2;
+connection node_3;
 SELECT f1 = 111 FROM t1;
 f1 = 111
 1

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+connection node_1;`
`1`	`2`	`create table t1 (i int, j int, k int, primary key pk(i)) engine=innodb;`
`2`	`3`	`insert into t1 values (1, 1, 1), (2, 2, 2), (3, 3, 3);`
`3`	`4`	`create table t2 (i int, j int, k int, primary key pk(i, j, k), index idx(i, k, j)) engine=innodb;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
	`1`	`+connection node_1;`
`1`	`2`	`TRUNCATE TABLE mysql.general_log;`
	`3`	`+connection node_2;`
`2`	`4`	`TRUNCATE TABLE mysql.general_log;`
	`5`	`+connection node_1;`
`3`	`6`	`SET SESSION wsrep_osu_method=TOI;`
`4`	`7`	`CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;`
`5`	`8`	`SET SESSION wsrep_osu_method=RSU;`
`@@ -8,6 +11,7 @@ SET SESSION wsrep_osu_method=TOI;`
`8`	`11`	`SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%';`
`9`	`12`	`COUNT(*) = 2`
`10`	`13`	`1`
	`14`	`+connection node_2;`
`11`	`15`	`SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';`
`12`	`16`	`COUNT(*) = 0`
`13`	`17`	`1`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,4 @@ SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';`
`11`	`11`	`COUNT(*) = 2`
`12`	`12`	`1`
`13`	`13`	`connection node_1;`
`14`		`-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';`
`15`		`-VARIABLE_VALUE = 2`
`16`		`-1`
`17`	`14`	`DROP TABLE t1;`
Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,5 @@ VARIABLE_VALUE = 'ON'`
`16`	`16`	`1`
`17`	`17`	`SET GLOBAL wsrep_cluster_address = '';`
`18`	`18`	`connection node_2;`
	`19`	`+disconnect node_2;`
	`20`	`+disconnect node_1;`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,5 @@ COUNT(*) = 11`
`33`	`33`	`1`
`34`	`34`	`CALL mtr.add_suppression("Protocol violation");`
`35`	`35`	`DROP TABLE t1;`
	`36`	`+connection node_1;`
`36`	`37`	`CALL mtr.add_suppression("Protocol violation");`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+connection node_1;`
	`2`	`+connection node_2;`
`1`	`3`	`connection node_2;`
`2`	`4`	`CREATE TABLE t1(i INT) ENGINE=INNODB;`
`3`	`5`	`INSERT INTO t1 VALUES(1);`