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

galera mtr tests: fixes for test failures, 'cosmetic' changes and unification between versions

Browse Source
This commit is contained in:
Julius Goryavsky
2025-02-06 21:29:04 +01:00
parent c35b6f133a
commit 7b040e53cc
161 changed files with 215 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/galera/r/MDEV-20225.result
View File

@@ -15,7 +15,7 @@ connection node_2a;
SET GLOBAL debug_dbug = 'RESET'; SET GLOBAL debug_dbug = 'RESET';
SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue'; SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
SET GLOBAL wsrep_slave_threads = 1; SET GLOBAL wsrep_slave_threads = DEFAULT;
connection node_2; connection node_2;
SHOW TRIGGERS; SHOW TRIGGERS;
Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation

2
mysql-test/suite/galera/r/MDEV-20793.result
View File

@@ -41,4 +41,4 @@ connection node_1;
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
SET debug_sync = "RESET"; SET debug_sync = "RESET";
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL wsrep_slave_threads = 1; SET GLOBAL wsrep_slave_threads = DEFAULT;

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

@@ -15,3 +15,4 @@ SET GLOBAL wsrep_slave_threads=1;
SELECT @@wsrep_slave_threads; SELECT @@wsrep_slave_threads;
@@wsrep_slave_threads @@wsrep_slave_threads
1 1
connection node_2;

4
mysql-test/suite/galera/r/galera_applier_ftwrl_table_alter.result
View File

@@ -13,7 +13,7 @@ connection node_1;
SELECT 1 FROM DUAL; SELECT 1 FROM DUAL;
1 1
1 1
SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'; SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
COUNT(*) = 1 COUNT(*) = 1
1 1
UNLOCK TABLES; UNLOCK TABLES;
@@ -25,7 +25,7 @@ t1 CREATE TABLE `t1` (
`f2` int(11) DEFAULT NULL, `f2` int(11) DEFAULT NULL,
PRIMARY KEY (`f1`) PRIMARY KEY (`f1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'; SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
COUNT(*) = 0 COUNT(*) = 0
1 1
DROP TABLE t1; DROP TABLE t1;

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

@@ -298,6 +298,7 @@ DROP TABLE p1, p2;
###################################################################### ######################################################################
connection node_1; connection node_1;
SET SESSION wsrep_sync_wait=0; SET SESSION wsrep_sync_wait=0;
FLUSH STATUS;
CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
@@ -491,6 +492,7 @@ Note 1051 Unknown table 'test.tmp1,test.tmp2'
###################################################################### ######################################################################
connection node_1; connection node_1;
SET SESSION wsrep_sync_wait=0; SET SESSION wsrep_sync_wait=0;
FLUSH STATUS;
CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
@@ -684,6 +686,7 @@ Note 1051 Unknown table 'test.tmp1,test.tmp2'
###################################################################### ######################################################################
connection node_1; connection node_1;
SET SESSION wsrep_sync_wait=0; SET SESSION wsrep_sync_wait=0;
FLUSH STATUS;
CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));

7
mysql-test/suite/galera/r/galera_parallel_apply_lock_table.result
View File

@@ -10,10 +10,10 @@ INSERT INTO t1 VALUES (1);
INSERT INTO t2 VALUES (1); INSERT INTO t2 VALUES (1);
connection node_2a; connection node_2a;
SET SESSION wsrep_sync_wait=0; SET SESSION wsrep_sync_wait=0;
SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committing%' or STATE = 'Waiting for certification'); SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification');
EXPECT_1 EXPECT_1
1 1
SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%Waiting for table metadata lock%'; SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
EXPECT_1 EXPECT_1
1 1
SELECT COUNT(*) AS EXPECT_0 FROM t1; SELECT COUNT(*) AS EXPECT_0 FROM t1;
@@ -32,9 +32,8 @@ EXPECT_1
SELECT COUNT(*) AS EXPECT_1 FROM t2; SELECT COUNT(*) AS EXPECT_1 FROM t2;
EXPECT_1 EXPECT_1
1 1
SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committed%' or STATE = 'Waiting for certification'); SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committed%' OR STATE LIKE 'Waiting for certification');
EXPECT_2 EXPECT_2
2 2
SET GLOBAL wsrep_slave_threads = 1;;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;

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

@@ -34,6 +34,5 @@ expect_20
SELECT COUNT(*) as expect_20 FROM t2; SELECT COUNT(*) as expect_20 FROM t2;
expect_20 expect_20
20 20
SET GLOBAL wsrep_slave_threads = 1;;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;

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

@@ -33,7 +33,6 @@ connection node_2;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
COUNT(*) COUNT(*)
70 70
SET GLOBAL wsrep_slave_threads = 1;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
# #

6
mysql-test/suite/galera/r/wsrep_strict_ddl.result
View File

@@ -20,7 +20,7 @@ ERROR HY000: DDL-statement is forbidden as table storage engine does not support
SHOW WARNINGS; SHOW WARNINGS;
Level Code Message Level Code Message
Error 4165 DDL-statement is forbidden as table storage engine does not support Galera replication Error 4165 DDL-statement is forbidden as table storage engine does not support Galera replication
Warning 1031 WSREP: wsrep_strict_dll enabled. Storage engine Aria not supported. Warning 1031 WSREP: wsrep_strict_ddl enabled. Storage engine Aria not supported.
connection node_2; connection node_2;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
@@ -31,9 +31,9 @@ ERROR HY000: DDL-statement is forbidden as table storage engine does not support
SHOW WARNINGS; SHOW WARNINGS;
Level Code Message Level Code Message
Error 4165 DDL-statement is forbidden as table storage engine does not support Galera replication Error 4165 DDL-statement is forbidden as table storage engine does not support Galera replication
Warning 1031 WSREP: wsrep_strict_dll enabled. Storage engine MyISAM not supported. Warning 1031 WSREP: wsrep_strict_ddl enabled. Storage engine MyISAM not supported.
Error 4165 DDL-statement is forbidden as table storage engine does not support Galera replication Error 4165 DDL-statement is forbidden as table storage engine does not support Galera replication
Warning 1031 WSREP: wsrep_strict_dll enabled. Storage engine MyISAM not supported. Warning 1031 WSREP: wsrep_strict_ddl enabled. Storage engine MyISAM not supported.
SHOW CREATE TABLE t2; SHOW CREATE TABLE t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (

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

@@ -11,58 +11,58 @@ return wsrep_not_ok() if wsrep_not_ok();
push @::global_suppressions, push @::global_suppressions,
( (
qr(WSREP: wsrep_sst_receive_address is set to '127\.0\.0\.1), qr(WSREP: wsrep_sst_receive_address is set to '127\.0\.0\.1),
qr(WSREP: Could not open saved state file for reading: .*), qr(WSREP: Could not open saved state file for reading: ),
qr(WSREP: Could not open state file for reading: .*), qr(WSREP: Could not open state file for reading: ),
qr(WSREP: Gap in state sequence\. Need state transfer\.), qr(WSREP: Gap in state sequence\. Need state transfer\.),
qr(WSREP: Failed to prepare for incremental state transfer:), qr(WSREP: Failed to prepare for incremental state transfer:),
qr(WSREP: .*down context.*), qr(WSREP: .*down context.*),
qr(WSREP: Failed to send state UUID:), qr(WSREP: Failed to send state UUID:),
qr(WSREP: last inactive check more than .* skipping check), qr(WSREP: last inactive check more than .* skipping check),
qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned\.), qr(WSREP: Releasing seqno [0-9]+ before [0-9]+ was assigned\.),
qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|, qr|WSREP: access file\(.*gvwstate.dat\) failed ?\(No such file or directory\)|,
qr(WSREP: Quorum: No node with complete state), qr(WSREP: Quorum: No node with complete state),
qr(WSREP: Initial position was provided by configuration or SST, avoiding override), qr(WSREP: Initial position was provided by configuration or SST, avoiding override),
qr|WSREP: discarding established \(time wait\) .*|, qr|WSREP: discarding established \(time wait\) |,
qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside\. Will use that one\.), qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside\. Will use that one\.),
qr(WSREP: evs::proto.*), qr(WSREP: evs::proto.*),
qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|, qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:|,
qr(WSREP: no nodes coming from prim view, prim not possible), qr(WSREP: no nodes coming from prim view, prim not possible),
qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable), qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable),
qr(WSREP: user message in state LEAVING), qr(WSREP: user message in state LEAVING),
qr(WSREP: .* sending install message failed: Transport endpoint is not connected), qr(WSREP: .* sending install message failed: Transport endpoint is not connected),
qr(WSREP: .* sending install message failed: Resource temporarily unavailable), qr(WSREP: .* sending install message failed: Resource temporarily unavailable),
qr(WSREP: Maximum writeset size exceeded by .*), qr(WSREP: Maximum writeset size exceeded by ),
qr(WSREP: transaction size exceeded.*), qr(WSREP: transaction size exceeded),
qr(WSREP: RBR event .*), qr(WSREP: RBR event ),
qr(WSREP: Ignoring error for TO isolated action: .*), qr(WSREP: Ignoring error for TO isolated action: ),
qr(WSREP: transaction size limit .*), qr(WSREP: transaction size limit ),
qr(WSREP: rbr write fail, .*), qr(WSREP: rbr write fail, ),
qr(WSREP: .*Backend not supported: foo.*), qr(WSREP: .*Backend not supported: foo),
qr(WSREP: .*Failed to initialize backend using .*), qr(WSREP: .*Failed to initialize backend using ),
qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*), qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at ),
qr(WSREP: gcs connect failed: Socket type not supported), qr(WSREP: gcs connect failed: Socket type not supported),
qr(WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 .*), qr(WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 .*),
qr(WSREP: .*Failed to open backend connection: -110 .*), qr(WSREP: .*Failed to open backend connection: -110 ),
qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*), qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at ),
qr(WSREP: gcs connect failed: Connection timed out), qr(WSREP: gcs connect failed: Connection timed out),
qr|WSREP: wsrep::connect\(.*\) failed: 7|, qr|WSREP: wsrep::connect\(.*\) failed: 7|,
qr(WSREP: SYNC message from member .* in non-primary configuration\. Ignored\.), qr(WSREP: SYNC message from member .* in non-primary configuration\. Ignored\.),
qr(WSREP: Could not find peer:), qr(WSREP: Could not find peer:),
qr(WSREP: TO isolation failed for: .*), qr(WSREP: TO isolation failed for: ),
qr|WSREP: gcs_caused\(\) returned .*|, qr|WSREP: gcs_caused\(\) returned |,
qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored\.|, qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(SYNCED\)\. Message ignored\.|,
qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored\.|, qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(JOINED\)\. Message ignored\.|,
qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled\. Expect abort\.|, qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled\. Expect abort\.|,
qr(WSREP: Action message in non-primary configuration from member [0-9]*), qr(WSREP: Action message in non-primary configuration from member [0-9]*),
qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*), qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*),
qr(WSREP: discarding established .*), qr(WSREP: discarding established ),
qr|WSREP: .*core_handle_uuid_msg.*|, qr|WSREP: .*core_handle_uuid_msg|,
qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0\. WSREP_SYNC_WAIT_BEFORE_READ is on), qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0\. WSREP_SYNC_WAIT_BEFORE_READ is on),
qr|WSREP: JOIN message from member .* in non-primary configuration\. Ignored\.|, qr|WSREP: JOIN message from member .* in non-primary configuration\. Ignored\.|,
qr|WSREP: .*Query apply failed:.*|, qr|WSREP: .*Query apply failed:|,
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: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.|, qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.|,
qr|WSREP: Send action \{.* STATE_REQUEST\} returned -107 \(Transport endpoint is not connected\)|, qr|WSREP: Send action \{.* STATE_REQUEST\} returned -107 \(Transport endpoint is not connected\)|,
qr|WSREP: Trying to continue unpaused monitor|, qr|WSREP: Trying to continue unpaused monitor|,

2
mysql-test/suite/galera/t/MDEV-10715.cnf
View File

@@ -4,10 +4,12 @@
log-bin=mysqld-bin log-bin=mysqld-bin
log-slave-updates log-slave-updates
binlog-format=ROW binlog-format=ROW
[mysqld.1] [mysqld.1]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1
wsrep_gtid_domain_id=1 wsrep_gtid_domain_id=1
[mysqld.2] [mysqld.2]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1

2
mysql-test/suite/galera/t/MDEV-15443.cnf
View File

@@ -1,5 +1,7 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqld.1] [mysqld.1]
wsrep_auto_increment_control=OFF wsrep_auto_increment_control=OFF
[mysqld.2] [mysqld.2]
wsrep_auto_increment_control=OFF wsrep_auto_increment_control=OFF

2
mysql-test/suite/galera/t/MDEV-20225.test
View File

@@ -41,7 +41,7 @@ INSERT INTO t1 VALUES (NULL);
SET GLOBAL debug_dbug = 'RESET'; SET GLOBAL debug_dbug = 'RESET';
SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue'; SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
SET GLOBAL wsrep_slave_threads = 1; SET GLOBAL wsrep_slave_threads = DEFAULT;
--connection node_2 --connection node_2
# Trigger should now be dropped on node_2. # Trigger should now be dropped on node_2.

2
mysql-test/suite/galera/t/MDEV-20793.test
View File

@@ -99,4 +99,4 @@ SET SESSION debug_sync = "now SIGNAL continue";
SET debug_sync = "RESET"; SET debug_sync = "RESET";
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL wsrep_slave_threads = 1; SET GLOBAL wsrep_slave_threads = DEFAULT;

2
mysql-test/suite/galera/t/MDEV-22227.test
View File

@@ -13,7 +13,7 @@ SET lock_wait_timeout= 1;
--connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1 --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1
--connection node_1b --connection node_1b
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Waiting for table level lock' --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table level lock'
--source include/wait_condition.inc --source include/wait_condition.inc
--connection node_1 --connection node_1

1
mysql-test/suite/galera/t/MDEV-24143.test
View File

@@ -21,4 +21,3 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, b INT) ENGINE=SEQUENCE;
ALTER TABLE t1 DROP COLUMN c2; ALTER TABLE t1 DROP COLUMN c2;
SELECT get_lock ('test', 1.5); SELECT get_lock ('test', 1.5);
DROP TABLE t1; DROP TABLE t1;

1
mysql-test/suite/galera/t/MDEV-24327.cnf
View File

@@ -3,4 +3,3 @@
[mysqld.1] [mysqld.1]
log-bin=mariadb-bin log-bin=mariadb-bin
log-slave-updates=OFF log-slave-updates=OFF

7
mysql-test/suite/galera/t/MDEV-25389.test
View File

@@ -7,6 +7,8 @@
--source ../galera/include/auto_increment_offset_save.inc --source ../galera/include/auto_increment_offset_save.inc
--connection node_2 --connection node_2
--let $wsrep_slave_threads_orig = `SELECT @@wsrep_slave_threads`
call mtr.add_suppression("WSREP: Failed to create/initialize system thread"); call mtr.add_suppression("WSREP: Failed to create/initialize system thread");
SET GLOBAL debug_dbug='+d,wsrep_simulate_failed_connection_1'; SET GLOBAL debug_dbug='+d,wsrep_simulate_failed_connection_1';
--error ER_WRONG_ARGUMENTS --error ER_WRONG_ARGUMENTS
@@ -21,4 +23,9 @@ SELECT @@wsrep_slave_threads;
# issue is fixed. # issue is fixed.
--source include/restart_mysqld.inc --source include/restart_mysqld.inc
--connection node_2
--disable_query_log
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
--enable_query_log
--source ../galera/include/auto_increment_offset_restore.inc --source ../galera/include/auto_increment_offset_restore.inc

2
mysql-test/suite/galera/t/MDEV-25731.test
View File

@@ -23,5 +23,3 @@ SELECT COUNT(*) AS EXPECT_12 FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL wsrep_load_data_splitting=OFF; SET GLOBAL wsrep_load_data_splitting=OFF;
SET GLOBAL wsrep_replicate_myisam=OFF; SET GLOBAL wsrep_replicate_myisam=OFF;

2
mysql-test/suite/galera/t/MDEV-26597.test
View File

@@ -28,5 +28,3 @@ SET SESSION wsrep_sync_wait = 0;
--source ../../galera/include/auto_increment_offset_restore.inc --source ../../galera/include/auto_increment_offset_restore.inc
--connection node_1 --connection node_1
DROP TABLE t3; DROP TABLE t3;

1
mysql-test/suite/galera/t/MDEV-27123.opt
View File

@@ -1,2 +1 @@
--wsrep_auto_increment_control=OFF --auto_increment_increment=3 --auto_increment_offset=3 --wsrep_auto_increment_control=OFF --auto_increment_increment=3 --auto_increment_offset=3

1
mysql-test/suite/galera/t/MDEV-29293.test
View File

@@ -38,4 +38,3 @@ set debug_sync= 'now SIGNAL continue';
--reap --reap
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';

2
mysql-test/suite/galera/t/MDEV-29512.cnf
View File

@@ -10,6 +10,4 @@ log_slave_updates
max-binlog-size=4096 max-binlog-size=4096
expire-logs-days=1 expire-logs-days=1
[mysqld.2] [mysqld.2]

5
mysql-test/suite/galera/t/MDEV-6860.cnf
View File

@@ -1,7 +1,8 @@
!include ../galera_2nodes_as_slave.cnf !include ../galera_2nodes_as_slave.cnf
[mysqld.1]
wsrep-slave-threads=10
[mysqld.2] [mysqld.2]
slave-parallel-threads=2 slave-parallel-threads=2
slave-parallel-mode=optimistic slave-parallel-mode=optimistic
[mysqld.1]
wsrep-slave-threads=10

1
mysql-test/suite/galera/t/MW-259.test
View File

@@ -39,4 +39,3 @@ SET GLOBAL wsrep_desync=0;
# Cleanup # Cleanup
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';

3
mysql-test/suite/galera/t/MW-313.cnf
View File

@@ -7,6 +7,3 @@ log-slave-updates
[mysqld.2] [mysqld.2]
log-bin log-bin
log-slave-updates log-slave-updates

1
mysql-test/suite/galera/t/MW-360-master.opt
View File

@@ -1,2 +1 @@
--gtid-domain-id=1 --log-bin --log-slave-updates --gtid-domain-id=1 --log-bin --log-slave-updates

2
mysql-test/suite/galera/t/MW-369.inc
View File

@@ -80,5 +80,3 @@ SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb';
SET GLOBAL DEBUG_DBUG = ""; SET GLOBAL DEBUG_DBUG = "";
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';

1
mysql-test/suite/galera/t/MW-86-wait8.cnf
View File

@@ -7,4 +7,3 @@ log-slave-updates
[mysqld.2] [mysqld.2]
log-bin log-bin
log-slave-updates log-slave-updates

1
mysql-test/suite/galera/t/create.test
View File

@@ -86,4 +86,3 @@ DROP TABLE t1, t2;
--source include/galera_end.inc --source include/galera_end.inc
--echo # End of tests --echo # End of tests

2
mysql-test/suite/galera/t/galera_MDEV-29512.cnf
View File

@@ -10,6 +10,4 @@ log_slave_updates
max-binlog-size=4096 max-binlog-size=4096
expire-logs-days=1 expire-logs-days=1
[mysqld.2] [mysqld.2]

2
mysql-test/suite/galera/t/galera_applier_ftwrl_table.test
View File

@@ -20,7 +20,7 @@ INSERT INTO t1 VALUES (2);
--connection node_1a --connection node_1a
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock' --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
--source include/wait_condition.inc --source include/wait_condition.inc
SELECT COUNT(*) = 0 FROM t1; SELECT COUNT(*) = 0 FROM t1;

3
mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.cnf
View File

@@ -9,6 +9,3 @@ wait_timeout=5
lock_wait_timeout=5 lock_wait_timeout=5
innodb_lock_wait_timeout=5 innodb_lock_wait_timeout=5
wait_timeout=5 wait_timeout=5

6
mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.test
View File

@@ -27,16 +27,16 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
--connection node_1 --connection node_1
SELECT 1 FROM DUAL; SELECT 1 FROM DUAL;
# Wait # Wait
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'; --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
--source include/wait_condition.inc --source include/wait_condition.inc
SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'; SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 15; SET SESSION wsrep_sync_wait = 15;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'; SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
DROP TABLE t1; DROP TABLE t1;

1
mysql-test/suite/galera/t/galera_as_slave_ctas.test
View File

@@ -73,4 +73,3 @@ RESET SLAVE ALL;
--connection node_3 --connection node_3
RESET MASTER; RESET MASTER;

6
mysql-test/suite/galera/t/galera_backup_stage.test
View File

@@ -56,7 +56,7 @@ ALTER TABLE t1 ADD COLUMN (f4 int(10));
# reach commit stage. In the unlikely case the interleaving is different, the # reach commit stage. In the unlikely case the interleaving is different, the
# result of the test should not change. # result of the test should not change.
--connection node_1c --connection node_1c
--let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (State='Commit' OR State='Waiting for certification') AND ID=$insert_id --let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification') AND ID=$insert_id
--source include/wait_condition.inc --source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id --let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id
--source include/wait_condition.inc --source include/wait_condition.inc
@@ -83,11 +83,11 @@ ALTER TABLE t1 ADD COLUMN (f4 int(10));
# wait for insert to get blocked # wait for insert to get blocked
--connection node_1c --connection node_1c
--let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (State='Commit' OR State='Waiting for certification') AND ID=$insert_id --let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification') AND ID=$insert_id
--source include/wait_condition.inc --source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id --let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id
--source include/wait_condition.inc --source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*)=2 FROM information_schema.processlist WHERE Info like 'INSERT INTO t1 (f1) values("node1%")' AND (State='Commit' or State='Waiting for certification') --let $wait_condition = SELECT COUNT(*)=2 FROM information_schema.processlist WHERE Info like 'INSERT INTO t1 (f1) values("node1%")' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification')
--source include/wait_condition.inc --source include/wait_condition.inc
# nothing after BLOCK_DDL is applied # nothing after BLOCK_DDL is applied

1
mysql-test/suite/galera/t/galera_bf_abort_at_after_statement.test
View File

@@ -55,4 +55,3 @@ DROP TABLE t1;
--disconnect node_2a --disconnect node_2a
--disconnect node_2b --disconnect node_2b

4
mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
View File

@@ -17,12 +17,12 @@ INSERT INTO t1 VALUES (2);
--connection node_2 --connection node_2
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock' --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
--source include/wait_condition.inc --source include/wait_condition.inc
UNLOCK TABLES; UNLOCK TABLES;
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock' --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
--source include/wait_condition.inc --source include/wait_condition.inc
COMMIT; COMMIT;

4
mysql-test/suite/galera/t/galera_bf_abort_lock_table.cnf
View File

@@ -1,5 +1 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqld.1]
wsrep-debug=1
loose-galera-bf-abort-lock-table=1

5
mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
View File

@@ -1,6 +1,5 @@
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/force_restart.inc
# #
# Test that a local LOCK TABLE will NOT be broken by an incoming remote transaction against that table # Test that a local LOCK TABLE will NOT be broken by an incoming remote transaction against that table
@@ -18,13 +17,13 @@ INSERT INTO t1 VALUES (2);
--connection node_2 --connection node_2
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock' --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
--let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST --let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
--source include/wait_condition_with_debug_and_kill.inc --source include/wait_condition_with_debug_and_kill.inc
UNLOCK TABLES; UNLOCK TABLES;
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock' --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
--let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST --let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
--source include/wait_condition_with_debug_and_kill.inc --source include/wait_condition_with_debug_and_kill.inc

1
mysql-test/suite/galera/t/galera_bf_abort_ps.cnf
View File

@@ -1,3 +1,4 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqltest] [mysqltest]
ps-protocol ps-protocol

2
mysql-test/suite/galera/t/galera_bf_background_statistics.cnf
View File

@@ -5,5 +5,3 @@ innodb_stats_persistent=ON
[mysqld.2] [mysqld.2]
innodb_stats_persistent=ON innodb_stats_persistent=ON

1
mysql-test/suite/galera/t/galera_bf_background_statistics.test
View File

@@ -46,4 +46,3 @@ ALTER TABLE t1 CHANGE f2 f2 INTEGER NOT NULL DEFAULT 1;
--enable_query_log --enable_query_log
DROP TABLE t1; DROP TABLE t1;

2
mysql-test/suite/galera/t/galera_bf_kill.test
View File

@@ -111,7 +111,7 @@ update t1 set a =5, b=2;
--connection node_2b --connection node_2b
SET SESSION wsrep_sync_wait=0; SET SESSION wsrep_sync_wait=0;
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Waiting for table metadata lock'; --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%';
--source include/wait_condition.inc --source include/wait_condition.inc
--connection node_2a --connection node_2a

1
mysql-test/suite/galera/t/galera_bf_lock_wait.test
View File

@@ -95,4 +95,3 @@ drop procedure p1;
--disconnect node_1_p2 --disconnect node_1_p2
--disconnect node_2_p1 --disconnect node_2_p1
--disconnect node_2_p2 --disconnect node_2_p2

2
mysql-test/suite/galera/t/galera_binlog_checksum.cnf
View File

@@ -9,5 +9,3 @@ slave-sql-verify-checksum=1
binlog-checksum=CRC32 binlog-checksum=CRC32
master-verify-checksum=1 master-verify-checksum=1
slave-sql-verify-checksum=1 slave-sql-verify-checksum=1

3
mysql-test/suite/galera/t/galera_binlog_event_max_size_max.cnf
View File

@@ -4,6 +4,3 @@
binlog-row-event-max-size=4294967040 binlog-row-event-max-size=4294967040
[mysqld.2] [mysqld.2]

3
mysql-test/suite/galera/t/galera_binlog_event_max_size_min.cnf
View File

@@ -4,6 +4,3 @@
binlog-row-event-max-size=256 binlog-row-event-max-size=256
[mysqld.2] [mysqld.2]

1
mysql-test/suite/galera/t/galera_binlog_event_max_size_min.test
View File

@@ -12,4 +12,3 @@ INSERT INTO t1 VALUES (REPEAT('x', 1000));
SELECT COUNT(*) = 1 FROM t1 WHERE f1 = REPEAT('x', 1000); SELECT COUNT(*) = 1 FROM t1 WHERE f1 = REPEAT('x', 1000);
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/t/galera_binlog_row_image.test
View File

@@ -94,7 +94,3 @@ SELECT COUNT(*) = 0 FROM t2;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;

1
mysql-test/suite/galera/t/galera_change_user.test
View File

@@ -26,4 +26,3 @@ reset_connection;
--connection node_1 --connection node_1
DROP TABLE t1; DROP TABLE t1;
DROP USER user1; DROP USER user1;

1
mysql-test/suite/galera/t/galera_concurrent_ctas.test
View File

@@ -98,4 +98,3 @@ DROP TABLE t1;
--source include/galera_end.inc --source include/galera_end.inc
--echo # End of test --echo # End of test

2
mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf
View File

@@ -7,5 +7,3 @@ loose-galera-ddl-fk-conflict=1
[mysqld.2] [mysqld.2]
wsrep-debug=1 wsrep-debug=1
loose-galera-ddl-fk-conflict=1 loose-galera-ddl-fk-conflict=1

1
mysql-test/suite/galera/t/galera_ddl_fk_conflict.test
View File

@@ -43,4 +43,3 @@ SET SESSION wsrep_sync_wait=0;
--source galera_ddl_fk_conflict_with_tmp.inc --source galera_ddl_fk_conflict_with_tmp.inc
# CHECK and ANALYZE are not affected # CHECK and ANALYZE are not affected

1
mysql-test/suite/galera/t/galera_ddl_multiline.test
View File

@@ -51,4 +51,3 @@ SHOW CREATE TABLE t6;
--connection node_1 --connection node_1
DROP TABLE t1, t2, t3, t4, t5, t6; DROP TABLE t1, t2, t3, t4, t5, t6;

2
mysql-test/suite/galera/t/galera_encrypt_tmp_files.cnf
View File

@@ -1,6 +1,6 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqld]
[mysqld]
encrypt-tmp-files = 1 encrypt-tmp-files = 1
plugin-load-add= @ENV.FILE_KEY_MANAGEMENT_SO plugin-load-add= @ENV.FILE_KEY_MANAGEMENT_SO
file-key-management file-key-management

1
mysql-test/suite/galera/t/galera_forced_binlog_format.test
View File

@@ -49,4 +49,3 @@ DROP DATABASE testdb_9401;
#--source include/galera_end.inc #--source include/galera_end.inc
--echo # End of tests --echo # End of tests

2
mysql-test/suite/galera/t/galera_gcs_fragment.cnf
View File

@@ -1,5 +1,7 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqld.1] [mysqld.1]
wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcs.max_packet_size=64' wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcs.max_packet_size=64'
[mysqld.2] [mysqld.2]
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcs.max_packet_size=64' wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcs.max_packet_size=64'

2
mysql-test/suite/galera/t/galera_gcs_max_packet_size.cnf
View File

@@ -1,5 +1,7 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqld.1] [mysqld.1]
wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcs.max_packet_size=64;gcache.size=10M' wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcs.max_packet_size=64;gcache.size=10M'
[mysqld.2] [mysqld.2]
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcs.max_packet_size=64;gcache.size=10M' wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcs.max_packet_size=64;gcache.size=10M'

1
mysql-test/suite/galera/t/galera_gtid.cnf
View File

@@ -7,4 +7,3 @@ log-slave-updates
[mysqld.2] [mysqld.2]
log-bin log-bin
log-slave-updates log-slave-updates

1
mysql-test/suite/galera/t/galera_gtid_server_id.cnf
View File

@@ -13,4 +13,3 @@ wsrep_gtid_mode=ON
server-id=12 server-id=12
log_slave_updates log_slave_updates
log_bin log_bin

3
mysql-test/suite/galera/t/galera_gtid_slave.cnf
View File

@@ -4,13 +4,16 @@
log-bin=mysqld-bin log-bin=mysqld-bin
log-slave-updates log-slave-updates
binlog-format=ROW binlog-format=ROW
[mysqld.1] [mysqld.1]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1
wsrep_gtid_domain_id=1 wsrep_gtid_domain_id=1
[mysqld.2] [mysqld.2]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1
wsrep_gtid_domain_id=1 wsrep_gtid_domain_id=1
[mysqld.3] [mysqld.3]
gtid-domain-id=2 gtid-domain-id=2

4
mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.cnf
View File

@@ -5,14 +5,16 @@ log-bin=mysqld-bin
log-slave-updates log-slave-updates
binlog-format=ROW binlog-format=ROW
wsrep_sst_method=rsync wsrep_sst_method=rsync
[mysqld.1] [mysqld.1]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1
wsrep_gtid_domain_id=1 wsrep_gtid_domain_id=1
[mysqld.2] [mysqld.2]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1
wsrep_gtid_domain_id=1 wsrep_gtid_domain_id=1
[mysqld.3] [mysqld.3]
gtid-domain-id=2 gtid-domain-id=2

2
mysql-test/suite/galera/t/galera_gtid_trx_conflict.cnf
View File

@@ -4,10 +4,12 @@
log-bin=mysqld-bin log-bin=mysqld-bin
log-slave-updates log-slave-updates
binlog-format=ROW binlog-format=ROW
[mysqld.1] [mysqld.1]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1
wsrep_gtid_domain_id=1 wsrep_gtid_domain_id=1
[mysqld.2] [mysqld.2]
gtid-domain-id=1 gtid-domain-id=1
wsrep_gtid_mode=1 wsrep_gtid_mode=1

1
mysql-test/suite/galera/t/galera_insert_ignore.test
View File

@@ -57,4 +57,3 @@ DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
DROP TABLE t3; DROP TABLE t3;
--eval SET GLOBAL wsrep_sync_wait = $wsrep_sync_wait_orig --eval SET GLOBAL wsrep_sync_wait = $wsrep_sync_wait_orig

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

@@ -113,10 +113,3 @@ SELECT COUNT(*) = 2 FROM t1;
SELECT COUNT(*) = 2 FROM t1; SELECT COUNT(*) = 2 FROM t1;
DROP TABLE t1; DROP TABLE t1;

3
mysql-test/suite/galera/t/galera_ist_progress.cnf
View File

@@ -2,6 +2,3 @@
[mysqld.1] [mysqld.1]
wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true' wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'

1
mysql-test/suite/galera/t/galera_ist_recv_bind.cnf
View File

@@ -5,4 +5,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;ist.recv_bind=127.0.0.1
[mysqld.2] [mysqld.2]
wsrep_provider_options='base_port=@mysqld.2.#galera_port;ist.recv_bind=127.0.0.1' wsrep_provider_options='base_port=@mysqld.2.#galera_port;ist.recv_bind=127.0.0.1'

2
mysql-test/suite/galera/t/galera_kill_applier.cnf
View File

@@ -1,7 +1,9 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqld.1] [mysqld.1]
wsrep_slave_threads=1
wsrep-debug=1 wsrep-debug=1
[mysqld.2] [mysqld.2]
wsrep_slave_threads=1
wsrep-debug=1 wsrep-debug=1

1
mysql-test/suite/galera/t/galera_load_data.test
View File

@@ -397,4 +397,3 @@ SELECT data_length from information_schema.tables WHERE TABLE_NAME = 'cardtest_t
--connection node_1 --connection node_1
use test; use test;
drop database cardtest02; drop database cardtest02;

2
mysql-test/suite/galera/t/galera_mdev_13787.cnf
View File

@@ -5,5 +5,3 @@ innodb-stats-persistent=1
[mysqld.2] [mysqld.2]
innodb-stats-persistent=1 innodb-stats-persistent=1

1
mysql-test/suite/galera/t/galera_mdev_13787.test
View File

@@ -1,5 +1,6 @@
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--connection node_1 --connection node_1
create table t(a int); create table t(a int);
insert into t select 1; insert into t select 1;

1
mysql-test/suite/galera/t/galera_mdev_15611.cnf
View File

@@ -1,4 +1,5 @@
!include ../galera_2nodes.cnf !include ../galera_2nodes.cnf
[mysqld.1] [mysqld.1]
[mysqld.2] [mysqld.2]

1
mysql-test/suite/galera/t/galera_mdl_race.test
View File

@@ -91,4 +91,3 @@ SET DEBUG_SYNC = "RESET";
--disconnect node_1a --disconnect node_1a
--disconnect node_1b --disconnect node_1b
--disconnect node_1c --disconnect node_1c

1
mysql-test/suite/galera/t/galera_nonPK_and_PA.test
View File

@@ -164,5 +164,6 @@ SET GLOBAL wsrep_slave_threads = DEFAULT;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
--connection node_2 --connection node_2
SET GLOBAL wsrep_slave_threads = DEFAULT; SET GLOBAL wsrep_slave_threads = DEFAULT;

1
mysql-test/suite/galera/t/galera_nopk_unicode.test
View File

@@ -39,5 +39,4 @@ COMMIT;
SELECT f1 = 'текст2' FROM t1; SELECT f1 = 'текст2' FROM t1;
SELECT f1 = 'текст2' FROM t1 WHERE f1 = 'текст2'; SELECT f1 = 'текст2' FROM t1 WHERE f1 = 'текст2';
DROP TABLE t1; DROP TABLE t1;

11
mysql-test/suite/galera/t/galera_parallel_apply_lock_table.test
View File

@@ -29,11 +29,13 @@ INSERT INTO t2 VALUES (1);
--let $galera_connection_name = node_2a --let $galera_connection_name = node_2a
--let $galera_server_number = 2 --let $galera_server_number = 2
--source include/galera_connect.inc --source include/galera_connect.inc
--connection node_2a --connection node_2a
--sleep 1 --sleep 1
SET SESSION wsrep_sync_wait=0; SET SESSION wsrep_sync_wait=0;
SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committing%' or STATE = 'Waiting for certification'); SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification');
SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%Waiting for table metadata lock%'; SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
SELECT COUNT(*) AS EXPECT_0 FROM t1; SELECT COUNT(*) AS EXPECT_0 FROM t1;
SELECT COUNT(*) AS EXPECT_0 FROM t2; SELECT COUNT(*) AS EXPECT_0 FROM t2;
@@ -44,8 +46,11 @@ UNLOCK TABLES;
--eval SET SESSION wsrep_sync_wait = $wsrep_sync_wait_orig; --eval SET SESSION wsrep_sync_wait = $wsrep_sync_wait_orig;
SELECT COUNT(*) AS EXPECT_1 FROM t1; SELECT COUNT(*) AS EXPECT_1 FROM t1;
SELECT COUNT(*) AS EXPECT_1 FROM t2; SELECT COUNT(*) AS EXPECT_1 FROM t2;
SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committed%' or STATE = 'Waiting for certification'); SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committed%' OR STATE LIKE 'Waiting for certification');
--disable_query_log
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig; --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
--enable_query_log
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;

1
mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test
View File

@@ -67,4 +67,3 @@ SELECT COUNT(DISTINCT f1) AS EXPECT_30000 FROM t1;
--connection default --connection default
DROP TABLE t1; DROP TABLE t1;
DROP TABLE ten; DROP TABLE ten;

2
mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test
View File

@@ -91,5 +91,3 @@ SELECT COUNT(DISTINCT f1) FROM t1;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE ten; DROP TABLE ten;
DROP PROCEDURE p1; DROP PROCEDURE p1;

6
mysql-test/suite/galera/t/galera_parallel_simple.test
View File

@@ -48,10 +48,10 @@ INSERT INTO t2 select * from t2;
--connection node_2 --connection node_2
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%'; --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
--source include/wait_condition.inc --source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committing%' or STATE = 'Waiting for certification'); --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification');
--source include/wait_condition.inc --source include/wait_condition.inc
UNLOCK TABLES; UNLOCK TABLES;
@@ -61,7 +61,9 @@ SET SESSION wsrep_sync_wait = 15;
SELECT COUNT(*) as expect_20 FROM t1; SELECT COUNT(*) as expect_20 FROM t1;
SELECT COUNT(*) as expect_20 FROM t2; SELECT COUNT(*) as expect_20 FROM t2;
--disable_query_log
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig; --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
--enable_query_log
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;

1
mysql-test/suite/galera/t/galera_pc_ignore_sb.cnf
View File

@@ -8,4 +8,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore
[mysqld.2] [mysqld.2]
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true'

1
mysql-test/suite/galera/t/galera_query_cache.cnf
View File

@@ -7,4 +7,3 @@ query_cache_size=1355776
[mysqld.2] [mysqld.2]
query_cache_type=1 query_cache_type=1
query_cache_size=1355776 query_cache_size=1355776

1
mysql-test/suite/galera/t/galera_query_cache_sync_wait.cnf
View File

@@ -7,4 +7,3 @@ query_cache_size=1355776
[mysqld.2] [mysqld.2]
query_cache_type=1 query_cache_type=1
query_cache_size=1355776 query_cache_size=1355776

1
mysql-test/suite/galera/t/galera_repl_key_format_flat16.test
View File

@@ -25,7 +25,6 @@ UPDATE t2 SET f1 = REPEAT('b', 256);
SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 234; SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 234;
SELECT COUNT(*) = 1 FROM t2 WHERE f1 = REPEAT('b', 256); SELECT COUNT(*) = 1 FROM t2 WHERE f1 = REPEAT('b', 256);
--disable_query_log --disable_query_log
--eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig'; --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig';
--enable_query_log --enable_query_log

1
mysql-test/suite/galera/t/galera_restart_nochanges.test
View File

@@ -37,4 +37,3 @@ DROP TABLE t1;
--source include/auto_increment_offset_restore.inc --source include/auto_increment_offset_restore.inc
--source include/galera_end.inc --source include/galera_end.inc

1
mysql-test/suite/galera/t/galera_restart_replica.cnf
View File

@@ -17,4 +17,3 @@ wsrep_gtid_mode=1
wsrep_gtid_domain_id=16 wsrep_gtid_domain_id=16
gtid_domain_id=11 gtid_domain_id=11
gtid_strict_mode=1 gtid_strict_mode=1

1
mysql-test/suite/galera/t/galera_savepoint_replay.test
View File

@@ -83,4 +83,3 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'b';
SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c'; SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
DROP TABLE t1; DROP TABLE t1;

1
mysql-test/suite/galera/t/galera_server.test
View File

@@ -25,4 +25,3 @@ SELECT COUNT(*)=0 FROM mysql.servers;
--source include/galera_end.inc --source include/galera_end.inc
--echo # End of test --echo # End of test

1
mysql-test/suite/galera/t/galera_set_position_after_cert_failure.test
View File

@@ -95,4 +95,5 @@ if ($galera_wsrep_start_position != $expected_position)
--connection node_1 --connection node_1
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL wsrep_slave_threads = DEFAULT; SET GLOBAL wsrep_slave_threads = DEFAULT;
--source include/auto_increment_offset_restore.inc --source include/auto_increment_offset_restore.inc

1
mysql-test/suite/galera/t/galera_sp_bf_abort.inc
View File

@@ -35,4 +35,3 @@
--source include/galera_signal_sync_point.inc --source include/galera_signal_sync_point.inc
--let $galera_sync_point = after_replicate_sync --let $galera_sync_point = after_replicate_sync
--source include/galera_signal_sync_point.inc --source include/galera_signal_sync_point.inc

1
mysql-test/suite/galera/t/galera_sql_log_bin_zero.test
View File

@@ -17,7 +17,6 @@ SET SESSION sql_log_bin = 1;
INSERT INTO t1 VALUES (2); INSERT INTO t1 VALUES (2);
--connection node_2 --connection node_2
SELECT COUNT(*) = 2 FROM t1; SELECT COUNT(*) = 2 FROM t1;
SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 1; SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 1;

2
mysql-test/suite/galera/t/galera_status_cluster.test
View File

@@ -14,5 +14,3 @@ SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VA
SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'; SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';

1
mysql-test/suite/galera/t/galera_status_local_index.test
View File

@@ -12,7 +12,6 @@ INSERT INTO wsrep_local_indexes VALUES ((SELECT variable_value FROM INFORMATION_
--connection node_2 --connection node_2
INSERT INTO wsrep_local_indexes VALUES ((SELECT variable_value FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_local_index')); INSERT INTO wsrep_local_indexes VALUES ((SELECT variable_value FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_local_index'));
--connection node_1 --connection node_1
SELECT COUNT(*) = 2 FROM wsrep_local_indexes; SELECT COUNT(*) = 2 FROM wsrep_local_indexes;
SELECT COUNT(DISTINCT wsrep_local_index) = 2 FROM wsrep_local_indexes; SELECT COUNT(DISTINCT wsrep_local_index) = 2 FROM wsrep_local_indexes;

4
mysql-test/suite/galera/t/galera_status_local_state.test
View File

@@ -22,7 +22,3 @@ SET GLOBAL wsrep_desync = 0;
--source include/wait_condition.inc --source include/wait_condition.inc
SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';

1
mysql-test/suite/galera/t/galera_suspend_slave.test
View File

@@ -67,4 +67,3 @@ DROP TABLE t1;
# Restore original auto_increment_offset values. # Restore original auto_increment_offset values.
--let $node_2=node_2a --let $node_2=node_2a
--source include/auto_increment_offset_restore.inc --source include/auto_increment_offset_restore.inc

1
mysql-test/suite/galera/t/galera_table_with_hyphen.inc
View File

@@ -45,4 +45,3 @@ SET GLOBAL wsrep_slave_threads=DEFAULT;
--connection node_2 --connection node_2
--eval drop table `$fk_child` --eval drop table `$fk_child`
--eval drop table `$fk_parent` --eval drop table `$fk_parent`

1
mysql-test/suite/galera/t/galera_temporary_sequences.test
View File

@@ -30,7 +30,6 @@ SELECT * FROM t;
SHOW CREATE TABLE seq1; SHOW CREATE TABLE seq1;
SHOW CREATE TABLE seq2; SHOW CREATE TABLE seq2;
--connection node_1 --connection node_1
DROP TABLE t; DROP TABLE t;
DROP SEQUENCE seq1; DROP SEQUENCE seq1;

2
mysql-test/suite/galera/t/galera_threadpool.cnf
View File

@@ -13,5 +13,3 @@ log_bin=binlog
log_slave_updates=ON log_slave_updates=ON
wsrep_sst_method=rsync wsrep_sst_method=rsync
thread_handling = pool-of-threads thread_handling = pool-of-threads

1
mysql-test/suite/galera/t/galera_toi_ftwrl.test
View File

@@ -19,4 +19,3 @@ UNLOCK TABLES;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;

1
mysql-test/suite/galera/t/galera_transaction_read_only.test
View File

@@ -55,4 +55,3 @@ COMMIT;
--enable_query_log --enable_query_log
DROP TABLE t1; DROP TABLE t1;

Some files were not shown because too many files have changed in this diff Show More