database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Test case cleanups.

Browse Source
This commit is contained in:
Jan Lindström
2020-06-22 13:25:25 +03:00
parent ccc4eb8530
commit b80b52394d
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/galera/r/galera_as_slave_gtid.result
View File

@@ -9,6 +9,7 @@ INSERT INTO t1 VALUES(1);
SELECT LENGTH(@@global.gtid_binlog_state) > 1; SELECT LENGTH(@@global.gtid_binlog_state) > 1;
LENGTH(@@global.gtid_binlog_state) > 1 LENGTH(@@global.gtid_binlog_state) > 1
1 1
connection node_1;
connection node_2; connection node_2;
gtid_binlog_state_equal gtid_binlog_state_equal
1 1

1
mysql-test/suite/galera/r/galera_as_slave_gtid_auto_engine.result
View File

@@ -9,6 +9,7 @@ INSERT INTO t1 VALUES(1);
SELECT LENGTH(@@global.gtid_binlog_state) > 1; SELECT LENGTH(@@global.gtid_binlog_state) > 1;
LENGTH(@@global.gtid_binlog_state) > 1 LENGTH(@@global.gtid_binlog_state) > 1
1 1
connection node_1;
connection node_2; connection node_2;
gtid_binlog_state_equal gtid_binlog_state_equal
1 1

3
mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result
View File

@@ -31,7 +31,6 @@ DROP TABLE t1;
connection node_1; connection node_1;
connection node_2; connection node_2;
connection node_3; connection node_3;
connection node_3;
RESET MASTER; RESET MASTER;
connection node_1; connection node_1;
STOP SLAVE; STOP SLAVE;
@@ -43,3 +42,5 @@ connection node_2;
SET GLOBAL WSREP_ON=OFF; SET GLOBAL WSREP_ON=OFF;
reset master; reset master;
SET GLOBAL WSREP_ON=ON; SET GLOBAL WSREP_ON=ON;
connection node_3;
RESET MASTER;

3
mysql-test/suite/galera/suite.pm
View File

@@ -62,7 +62,8 @@ push @::global_suppressions,
qr(WSREP: Ignoring error*), qr(WSREP: Ignoring error*),
qr(WSREP: Failed to remove page file .*), qr(WSREP: Failed to remove page file .*),
qr(WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*), qr(WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*),
qr(WSREP: .*Transport endpoint is not connected.*), qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\). Will retry in new primary component.|,
qr|WSREP: Trying to continue unpaused monitor|,
); );
sub skip_combinations { sub skip_combinations {

7
mysql-test/suite/galera/t/galera_as_slave_gtid.inc
View File

@@ -27,6 +27,13 @@ INSERT INTO t1 VALUES(1);
SELECT LENGTH(@@global.gtid_binlog_state) > 1; SELECT LENGTH(@@global.gtid_binlog_state) > 1;
--let $gtid_binlog_state_node1 = `SELECT @@global.gtid_binlog_state;` --let $gtid_binlog_state_node1 = `SELECT @@global.gtid_binlog_state;`
--connection node_1
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
--source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*) = 1 FROM t1;
--source include/wait_condition.inc
--connection node_2 --connection node_2
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
--source include/wait_condition.inc --source include/wait_condition.inc

7
mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test
View File

@@ -59,6 +59,8 @@ SELECT COUNT(*) AS EXPECT_0 FROM t1;
--connection node_3 --connection node_3
DROP TABLE t1; DROP TABLE t1;
--sleep 1
--connection node_1 --connection node_1
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
--source include/wait_condition.inc --source include/wait_condition.inc
@@ -70,8 +72,6 @@ DROP TABLE t1;
--connection node_3 --connection node_3
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
--source include/wait_condition.inc --source include/wait_condition.inc
--connection node_3
RESET MASTER; RESET MASTER;
--connection node_1 --connection node_1
@@ -85,3 +85,6 @@ SET GLOBAL WSREP_ON=ON;
SET GLOBAL WSREP_ON=OFF; SET GLOBAL WSREP_ON=OFF;
reset master; reset master;
SET GLOBAL WSREP_ON=ON; SET GLOBAL WSREP_ON=ON;
--connection node_3
RESET MASTER;