Skip to content

Commit

Permalink
Update test results in galera, galera_3nodes suites.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nirbhay Choubey committed Nov 7, 2016
1 parent 9ddbf2c commit d5e6d83
Show file tree
Hide file tree
Showing 17 changed files with 67 additions and 5 deletions.
1 change: 1 addition & 0 deletions mysql-test/suite/galera/r/GAL-382.result
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 3 additions & 0 deletions mysql-test/suite/galera/r/MW-252.result
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 4 additions & 0 deletions mysql-test/suite/galera/r/MW-44.result
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions mysql-test/suite/galera/r/enforce_storage_engine2.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions mysql-test/suite/galera/r/galera_as_slave_autoinc.result
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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;
3 changes: 0 additions & 3 deletions mysql-test/suite/galera/r/galera_kill_ddl.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 2 additions & 0 deletions mysql-test/suite/galera/r/galera_pc_ignore_sb.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ VARIABLE_VALUE = 'ON'
1
SET GLOBAL wsrep_cluster_address = '';
connection node_2;
disconnect node_2;
disconnect node_1;
3 changes: 3 additions & 0 deletions mysql-test/suite/galera/r/galera_restart_nochanges.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
2 changes: 2 additions & 0 deletions mysql-test/suite/galera/r/galera_roles.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions mysql-test/suite/galera/r/galera_split_brain.result
View file
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions mysql-test/suite/galera/r/galera_var_desync_on.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
2 changes: 2 additions & 0 deletions mysql-test/suite/galera/r/galera_var_dirty_reads.result
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
9 changes: 9 additions & 0 deletions mysql-test/suite/galera/r/mdev_10518.result
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# On node_1
connection node_1;
list of GTID variables :
gtid_domain_id 1
gtid_binlog_pos
Expand All @@ -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
Expand All @@ -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);
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 :
Expand All @@ -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
5 changes: 5 additions & 0 deletions mysql-test/suite/galera/r/mysql-wsrep#31.result
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
11 changes: 11 additions & 0 deletions mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 4 additions & 0 deletions mysql-test/suite/galera_3nodes/r/galera_certification_double_failure.result
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 6 additions & 0 deletions mysql-test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit d5e6d83

Please sign in to comment.