Refs: MW-248

- fixed the test case and extended with autoinc modification is master side

Author: sjaakola

mysql-test/suite/galera/r/galera_as_slave_autoinc.result

@@ -18,44 +18,67 @@ i	c
 2	dummy_text
 3	dummy_text
 4	dummy_text
+SET SESSION auto_increment_increment=7;
+insert into t1(i) values(null), (null), (null);
+SET SESSION auto_increment_offset=5;
+insert into t1(i) values(null), (null), (null);
+select * from t1;
+i	c
+1	dummy_text
+2	dummy_text
+3	dummy_text
+4	dummy_text
+8	dummy_text
+15	dummy_text
+22	dummy_text
+33	dummy_text
+40	dummy_text
+47	dummy_text
 show variables like 'binlog_format';
 Variable_name	Value
 binlog_format	STATEMENT
 show variables like '%auto_increment%';
 Variable_name	Value
-auto_increment_increment	1
-auto_increment_offset	1
+auto_increment_increment	7
+auto_increment_offset	5
 wsrep_auto_increment_control	ON
 select * from t1;
 i	c
 1	dummy_text
 2	dummy_text
 3	dummy_text
 4	dummy_text
+8	dummy_text
+15	dummy_text
+22	dummy_text
+33	dummy_text
+40	dummy_text
+47	dummy_text
 show variables like 'binlog_format';
 Variable_name	Value
 binlog_format	ROW
-show variables like '%auto_increment%';
+show variables like 'auto_increment_increment';
 Variable_name	Value
 auto_increment_increment	2
-auto_increment_offset	1
-wsrep_auto_increment_control	ON
 select * from t1;
 i	c
 1	dummy_text
 2	dummy_text
 3	dummy_text
 4	dummy_text
+8	dummy_text
+15	dummy_text
+22	dummy_text
+33	dummy_text
+40	dummy_text
+47	dummy_text
 show variables like 'binlog_format';
 Variable_name	Value
 binlog_format	ROW
-show variables like '%auto_increment%';
+show variables like 'auto_increment_increment';
 Variable_name	Value
 auto_increment_increment	2
-auto_increment_offset	2
-wsrep_auto_increment_control	ON
 DROP TABLE t1;
 STOP SLAVE;
 RESET SLAVE ALL;
-SET GLOBAL binlog_format='ROW';
 RESET MASTER;

mysql-test/suite/galera/t/galera_as_slave_autoinc.test

@@ -40,27 +40,35 @@ insert into t1(i) values(null), (null), (null);
 
 select * from t1;
 
+SET SESSION auto_increment_increment=7;
+insert into t1(i) values(null), (null), (null);
+
+SET SESSION auto_increment_offset=5;
+insert into t1(i) values(null), (null), (null);
+
+select * from t1;
+
 show variables like 'binlog_format';
 show variables like '%auto_increment%';
 
 --connection node_2
 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 --source include/wait_condition.inc
 
---let $wait_condition = SELECT COUNT(*) = 4 FROM t1;
+--let $wait_condition = SELECT COUNT(*) = 10 FROM t1;
 --source include/wait_condition.inc
 
 select * from t1;
 
 show variables like 'binlog_format';
-show variables like '%auto_increment%';
+show variables like 'auto_increment_increment';
 
 --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
 
 select * from t1;
 
 show variables like 'binlog_format';
-show variables like '%auto_increment%';
+show variables like 'auto_increment_increment';
 
 --connection node_1
 DROP TABLE t1;
@@ -73,7 +81,4 @@ STOP SLAVE;
 RESET SLAVE ALL;
 
 --connection node_1
-
-SET GLOBAL binlog_format='ROW';
-
 RESET MASTER;