galera tests: synchronization between versions and editions

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

@@ -198,7 +198,7 @@ wsrep_auto_increment_control	ON
 SET GLOBAL wsrep_auto_increment_control='OFF';
 show variables like '%auto_increment%';
 Variable_name	Value
-auto_increment_increment	1
+auto_increment_increment	2
 auto_increment_offset	2
 wsrep_auto_increment_control	OFF
 SET GLOBAL wsrep_auto_increment_control='ON';

mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.cnf

@@ -2,8 +2,8 @@
 
 [mysqld.1]
 auto_increment_offset=1
-auto_increment_increment=1
+auto_increment_increment=2
 
 [mysqld.2]
 auto_increment_offset=2
-auto_increment_increment=1
+auto_increment_increment=2

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

@@ -13,7 +13,7 @@
 --source include/force_restart.inc
 
 # Make sure that the test is operating on the right version of galera library.
---let $galera_version=26.4.21
+--let $galera_version=26.4.23
 source ../wsrep/include/check_galera_version.inc;
 
 # Global Variables

mysql-test/suite/galera/t/galera_fk_truncate.cnf

@@ -2,8 +2,8 @@
 
 [mysqld.1]
 auto_increment_offset=1
-auto_increment_increment=1
+auto_increment_increment=2
 
 [mysqld.2]
 auto_increment_offset=2
-auto_increment_increment=1
+auto_increment_increment=2

mysql-test/suite/galera_3nodes/t/galera_ist_gcache_rollover.cnf

@@ -2,7 +2,7 @@
 
 [mysqld.1]
 wsrep_provider_options='pc.ignore_sb=true;repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=1M'
-auto_increment_increment=1
+auto_increment_increment=3
 auto_increment_offset=1
 # this will force server restarts before this test
 loose-galera-ist-gcache-rollover=1
@@ -10,7 +10,7 @@ wsrep-debug=1
 
 [mysqld.2]
 wsrep_provider_options='pc.ignore_sb=true;repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=1M'
-auto_increment_increment=2
+auto_increment_increment=3
 auto_increment_offset=2
 loose-galera-ist-gcache-rollover=2
 wsrep-debug=1

mysql-test/suite/galera_sr/r/galera_sr_myisam.result

@@ -14,3 +14,4 @@ LENGTH(f1) = 65535
 1
 DROP TABLE t1;
 connection node_1;
+SET GLOBAL wsrep_mode = DEFAULT;

mysql-test/suite/galera_sr/t/galera_sr_myisam.test

@@ -22,6 +22,4 @@ SELECT LENGTH(f1) = 65535 FROM t1;
 DROP TABLE t1;
 
 --connection node_1
---disable_query_log
 SET GLOBAL wsrep_mode = DEFAULT;
---enable_query_log