mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
galera mtr tests: fixes for test failures, 'cosmetic' changes and unification between versions
This commit is contained in:
@@ -69,5 +69,4 @@ SET DEBUG_SYNC = 'RESET';
|
||||
--disconnect node_2
|
||||
--connect node_2, 127.0.0.1, root, , test, $NODE_MYPORT_2
|
||||
|
||||
|
||||
--source suite/galera/include/auto_increment_offset_restore.inc
|
||||
|
@@ -7,7 +7,7 @@
|
||||
# leave the cluster.
|
||||
#
|
||||
|
||||
CALL mtr.add_suppression("WSREP: discarding established.*");
|
||||
CALL mtr.add_suppression("WSREP: discarding established");
|
||||
|
||||
# Save original auto_increment_offset values.
|
||||
--let $node_1=node_1
|
||||
|
@@ -1 +1 @@
|
||||
--log-bin --log-slave-updates --loose-galera-sr-gtid-unique
|
||||
--log-bin --log-slave-updates --loose-galera-sr-gtid-unique
|
||||
|
@@ -8,4 +8,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore
|
||||
|
||||
[mysqld.2]
|
||||
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true'
|
||||
|
||||
|
@@ -1,6 +1,7 @@
|
||||
!include ../galera_2nodes.cnf
|
||||
|
||||
[mysqld.1]
|
||||
wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=16K'
|
||||
|
||||
[mysqld.2]
|
||||
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=16K'
|
||||
|
||||
|
@@ -18,4 +18,3 @@ DROP TABLE t1;
|
||||
|
||||
--connection node_2
|
||||
--source include/galera_wait_ready.inc
|
||||
|
||||
|
@@ -47,7 +47,7 @@ COMMIT;
|
||||
--reap
|
||||
|
||||
--connection node_2
|
||||
SET GLOBAL wsrep_slave_threads = 1;
|
||||
SET GLOBAL wsrep_slave_threads = DEFAULT;
|
||||
SET GLOBAL debug_dbug = '';
|
||||
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
|
||||
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
|
||||
|
@@ -40,7 +40,6 @@ COMMIT;
|
||||
--connection node_1
|
||||
SELECT COUNT(*) = 6 FROM t1;
|
||||
|
||||
|
||||
--connection node_2
|
||||
SELECT COUNT(*) = 6 FROM t1;
|
||||
|
||||
|
@@ -39,7 +39,3 @@ SELECT COUNT(*) = 0 FROM t2;
|
||||
--connection node_1
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user