Skip to content

Commit d61ed5d

Browse files
author
Jan Lindström
committed
MDEV-13549: Galera test failures
Fix test case galera.pxc-421 to reset auto_increment_offset correctly.
1 parent 1479273 commit d61ed5d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

mysql-test/suite/galera/r/pxc-421.result

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ SET GLOBAL wsrep_slave_threads = 1;
2626
SELECT COUNT(*) FROM t1;
2727
COUNT(*)
2828
16
29-
SET GLOBAL auto_increment_offset = 2;
3029
SELECT COUNT(*) FROM t1;
3130
COUNT(*)
3231
15
@@ -35,4 +34,3 @@ Variable_name Value
3534
wsrep_slave_threads 12
3635
SET GLOBAL wsrep_slave_threads = 1;
3736
DROP TABLE t1;
38-
SET GLOBAL auto_increment_offset = 1;

mysql-test/suite/galera/t/pxc-421.test

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
--source include/galera_cluster.inc
77
--source include/have_innodb.inc
88

9+
# Save original auto_increment_offset values.
10+
--let $node_1=node_1
11+
--let $node_2=node_2
12+
--source include/auto_increment_offset_save.inc
13+
914
--connection node_1
1015
--let $wsrep_slave_1 = `SELECT @@wsrep_slave_threads`
1116
set GLOBAL wsrep_slave_threads=26;
@@ -54,12 +59,11 @@ show global variables like 'wsrep_slave_threads';
5459
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_2
5560
SELECT COUNT(*) FROM t1;
5661

57-
SET GLOBAL auto_increment_offset = 2;
58-
5962
--connection node_1
6063
SELECT COUNT(*) FROM t1;
6164
show global variables like 'wsrep_slave_threads';
6265
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_1
6366
DROP TABLE t1;
6467

65-
SET GLOBAL auto_increment_offset = 1;
68+
--source include/auto_increment_offset_restore.inc
69+

0 commit comments

Comments
 (0)