Galera test fixes and add remaining test failures as disabled.

17 files changed, 93 insertions, 54 deletions

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 84d2b1c54bf..22fb3c4f12d 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -1,47 +1,43 @@
-galera_wsrep_provider_unset_set : lp1379204 'Unsupported protocol downgrade: incremental data collection disabled. Expect abort.'
-galera_kill_nochanges : mysql-wsrep#24 Galera server does not restart properly if killed
-galera_bf_abort_for_update : mysql-wsrep#26 SELECT FOR UPDATE sometimes allowed to proceed in the face of a concurrent update
-galera_toi_ddl_fk_insert : qa#39 galera_toi_ddl_fk_insert fails sporadically
-galera_binlog_row_image : MDEV-7471 - Enable binlog_row_image parameter in MariaDB
-galera_binlog_rows_query_log_events : Unknown system variable 'binlog_rows_query_log_events' (see annotate_rows_log_event)
-
-galera_ist_mysqldump : Lost connection to MySQL server during query
-galera_ist_xtrabackup-v2 : mysqltest failed but provided no output
-galera_ist_innodb_flush_logs : mysqltest failed but provided no output
-galera_sst_mysqldump : query 'show status' failed with wrong errno 1927
-galera_as_master_gtid : Needs to be re-worked
-galera_as_master_gtid_change_master : Needs to be re-worked
-galera_migrate : query 'let $success= `$wait_condition`' failed: 1146
-galera_var_notify_cmd : Result content mismatch
-query_cache : Fails intermittently due to content mismatch. Needs to be investigated
-basic : Fails intermittently without providing any output. Needs to be investigated
-galera_var_auto_inc_control_on : Failing sporadically with content mismatch
-galera_parallel_simple : Failing sporadically
-galera_bf_abort : Failing sporadically
-galera_log_output_csv : Failing sporadically
-galera_as_slave_preordered : wsrep-preordered is not available in MariaDB Galera cluster
-galera_gra_log : TODO: investigate
-galera_as_slave_replication_bundle : TODO: investigate
-galera_ssl_upgrade : TODO: investigate
-mysql-wsrep#90 : TODO: investigate
-galera_flush : mysql-wsrep/issues/229
-galera_transaction_read_only : mysql-wsrep/issues/229
-galera_gcs_fragment : Incorrect arguments to SET
-galera_flush_local : Fails sporadically
-galera_binlog_stmt_autoinc : TODO: investigate
-galera_concurrent_ctas : Test times out, investigate
-galera_sst_xtrabackup-v2-options : TODO: Fix test case
-mysql-wsrep#33 : TODO: investigate
-GAL-480 : Investigate
-galera_fk_no_pk :Investigate
-galera_account_management : Investigate
-galera.galera_var_retry_autocommit : MDEV-12319 #Sparodic Faliure
-galera.galera_toi_ddl_nonconflicting : MDEV-12319 #Sparodic Faliure
-galera.galera_pc_ignore_sb : MDEV-12319 #Sparodic Faliure
-galera.galera_ist_recv_bind : MDEV-12319 #Failed to start mysqld
-galera.galera_ssl_compression : MDEV-12319 #Failed to start mysqld
-galera.galera_wan : MDEV-12319 #Failed to start mysqld
-galera.rpl_row_annotate : MDEV-12319 #Failed to start mysqld
-galera.MW-44 : MDEV-12319
-galera.galera_var_slave_threads : MDEV-12319
-MW-336: MDEV-13549 Galera test failures
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : MDEV-<xxxx> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+MW-336 : MDEV-13549 Galera test failures
+galera_gra_log : MDEV-13549 Galera test failures
+galera_flush_local : MDEV-13549 Galera test failures
+galera_flush :  MDEV-13549 Galera test failures
+MW-329 : MDEV-13549 Galera test failures
+galera_account_management : MariaDB 10.0 does not support ALTER USER
+galera_binlog_row_image : MariaDB 10.0 does not support binlog_row_image
+galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events
+GAL-419 : MDEV-13549 Galera test failures
+galera_toi_ddl_fk_insert : MDEV-13549 Galera test failures
+galera_var_notify_cmd : MDEV-13549 Galera test failures
+galera_var_slave_threads : MDEV-13549 Galera test failures
+mysql-wsrep#90 : MDEV-13549 Galera test failures
+galera_as_master_gtid : Requires MySQL GTID
+galera_as_master_gtid_change_master : Requires MySQL GTID
+galera_as_slave_replication_bundle : MDEV-13549 Galera test failures
+galera_as_slave_preordered : wsrep-preordered feature not merged to MariaDB
+galera_gcs_fragment : MDEV-13549 Galera test failures
+galera_gcache_recover : MDEV-13549 Galera test failures
+galera_gcache_recover_full_gcache : MDEV-13549 Galera test failures
+galera_gcache_recover_manytrx : MDEV-13549 Galera test failures
+galera_ist_mysqldump : MDEV-13549 Galera test failures
+mysql-wsrep#31 :  MDEV-13549 Galera test failures
+galera_migrate : MariaDB 10.0 does not support START SLAVE USER
+galera_concurrent_ctas : MDEV-13549 Galera test failures
+galera_bf_abort_for_update : MDEV-13549 Galera test failures
+galera_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures
+galera_ssl_upgrade : MDEV-13549 Galera test failures
+mysql-wsrep#33 : MDEV-13549 Galera test failures
+galera_var_auto_inc_control_on : MDEV-13549 Galera test failures
+MW-44 : MDEV-13549 Galera test failures
+galera_var_retry_autocommit : MDEV-13549 Galera test failures
\ No newline at end of file
diff --git a/mysql-test/suite/galera/r/galera#414.result b/mysql-test/suite/galera/r/galera#414.result
index 029961f9463..5bb22587241 100644
--- a/mysql-test/suite/galera/r/galera#414.result
+++ b/mysql-test/suite/galera/r/galera#414.result
@@ -2,4 +2,6 @@ SET SESSION wsrep_sync_wait = 0;
 SET SESSION wsrep_on = OFF;
 SET SESSION wsrep_on = ON;
 CALL mtr.add_suppression("Failed to set packet size");
+set GLOBAL auto_increment_offset = 1;
 CALL mtr.add_suppression("Failed to set packet size");
+set GLOBAL auto_increment_offset = 2;
diff --git a/mysql-test/suite/galera/r/galera_var_dirty_reads.result b/mysql-test/suite/galera/r/galera_var_dirty_reads.result
index 405d86b3027..c469e49731d 100644
--- a/mysql-test/suite/galera/r/galera_var_dirty_reads.result
+++ b/mysql-test/suite/galera/r/galera_var_dirty_reads.result
@@ -42,4 +42,6 @@ SELECT * FROM t1;
 i
 1
 DROP TABLE t1;
+set GLOBAL auto_increment_offset = 1;
+set GLOBAL auto_increment_offset = 2;
 # End of test
diff --git a/mysql-test/suite/galera/r/galera_wsrep_provider_unset_set.result b/mysql-test/suite/galera/r/galera_wsrep_provider_unset_set.result
index 681e4606b38..89110b48def 100644
--- a/mysql-test/suite/galera/r/galera_wsrep_provider_unset_set.result
+++ b/mysql-test/suite/galera/r/galera_wsrep_provider_unset_set.result
@@ -3,6 +3,7 @@ INSERT INTO t1 VALUES (1);
 SET GLOBAL wsrep_provider='none';
 INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
+SET SESSION wsrep_sync_wait = 0;
 INSERT INTO t1 VALUES (4);
 SELECT COUNT(*) = 4 FROM t1;
 COUNT(*) = 4
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 5b69ff26615..c366ec7c136 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -19,6 +19,9 @@ $ENV{WSREP_PROVIDER} = $provider;
 my ($spath) = grep { -f "$_/wsrep_sst_rsync"; } "$::bindir/scripts", $::path_client_bindir;
 return "No SST scripts" unless $spath;
 
+my ($cpath) = grep { -f "$_/mysql"; } "$::bindir/scripts", $::path_client_bindir;
+return "No scritps" unless $cpath;
+
 my ($epath) = grep { -f "$_/my_print_defaults"; } "$::bindir/extra", $::path_client_bindir;
 return "No my_print_defaults" unless $epath;
 
@@ -67,6 +70,8 @@ push @::global_suppressions,
      qr(WSREP: TO isolation failed for: .*),
      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 \(JOINED\). Message ignored.|,
+     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: discarding established .*),
    );
@@ -74,6 +79,7 @@ push @::global_suppressions,
 
 $ENV{PATH}="$epath:$ENV{PATH}";
 $ENV{PATH}="$spath:$ENV{PATH}" unless $epath eq $spath;
+$ENV{PATH}="$cpath:$ENV{PATH}" unless $cpath eq $spath;
 
 bless { };
 
diff --git a/mysql-test/suite/galera/t/galera#414.test b/mysql-test/suite/galera/t/galera#414.test
index dccb28e4054..de10898df42 100644
--- a/mysql-test/suite/galera/t/galera#414.test
+++ b/mysql-test/suite/galera/t/galera#414.test
@@ -6,6 +6,11 @@
 --source include/have_innodb.inc
 --source include/galera_cluster.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 # We perform the shutdown/restart sequence in here. If there was a crash during shutdown, MTR will detect it
 
 --connection node_2
@@ -35,3 +40,4 @@ CALL mtr.add_suppression("Failed to set packet size");
 --source include/wait_condition.inc
 CALL mtr.add_suppression("Failed to set packet size");
 
+--source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf b/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf
index db6b7d5e129..357c8678658 100644
--- a/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf
+++ b/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf
@@ -9,3 +9,4 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true'
 
+
diff --git a/mysql-test/suite/galera/t/galera_ist_recv_bind.test b/mysql-test/suite/galera/t/galera_ist_recv_bind.test
index cb7329073ad..a339684c158 100644
--- a/mysql-test/suite/galera/t/galera_ist_recv_bind.test
+++ b/mysql-test/suite/galera/t/galera_ist_recv_bind.test
@@ -5,6 +5,7 @@
 
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
+--source include/big_test.inc
 
 --connection node_1
 SELECT @@wsrep_provider_options LIKE '%ist.recv_bind = 127.0.0.1%';
diff --git a/mysql-test/suite/galera/t/galera_ist_rsync.cnf b/mysql-test/suite/galera/t/galera_ist_rsync.cnf
index bbe0f6047fb..797e3651967 100644
--- a/mysql-test/suite/galera/t/galera_ist_rsync.cnf
+++ b/mysql-test/suite/galera/t/galera_ist_rsync.cnf
@@ -5,7 +5,9 @@ wsrep_sst_method=rsync
 
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'
+wsrep_sync_wait=1
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true'
+wsrep_sync_wait=1
 
diff --git a/mysql-test/suite/galera/t/galera_ist_rsync.test b/mysql-test/suite/galera/t/galera_ist_rsync.test
index 41d1a0c1fc2..1da79cd4214 100644
--- a/mysql-test/suite/galera/t/galera_ist_rsync.test
+++ b/mysql-test/suite/galera/t/galera_ist_rsync.test
@@ -2,7 +2,12 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
 --source suite/galera/include/galera_st_disconnect_slave.inc
 --source suite/galera/include/galera_st_shutdown_slave.inc
 --source suite/galera/include/galera_st_kill_slave.inc
 --source suite/galera/include/galera_st_kill_slave_ddl.inc
+--source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test b/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
index 2f27678b547..a8ea639415d 100644
--- a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
+++ b/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
@@ -6,6 +6,11 @@
 CALL mtr.add_suppression("Aborting");
 CALL mtr.add_suppression("unknown option '--galera-unknown-option'");
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 #
 # We should count the number of "Assertion failed" warnings
 # in the log file before and after testing. To do this we need
@@ -148,3 +153,5 @@ DROP TABLE t1;
    }
 EOF
 --remove_file $TEST_LOG.copy
+
+--source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_ssl.test b/mysql-test/suite/galera/t/galera_ssl.test
index 8dc94dc1966..e6346aa2151 100644
--- a/mysql-test/suite/galera/t/galera_ssl.test
+++ b/mysql-test/suite/galera/t/galera_ssl.test
@@ -8,6 +8,7 @@
 
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
+--source include/big_test.inc
 
 SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
diff --git a/mysql-test/suite/galera/t/galera_ssl_compression.test b/mysql-test/suite/galera/t/galera_ssl_compression.test
index cdecf4807d4..75f92c5b2f4 100644
--- a/mysql-test/suite/galera/t/galera_ssl_compression.test
+++ b/mysql-test/suite/galera/t/galera_ssl_compression.test
@@ -7,6 +7,7 @@
 
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
+--source include/big_test.inc
 
 SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
diff --git a/mysql-test/suite/galera/t/galera_var_dirty_reads.test b/mysql-test/suite/galera/t/galera_var_dirty_reads.test
index 183c60753ad..152c875a946 100644
--- a/mysql-test/suite/galera/t/galera_var_dirty_reads.test
+++ b/mysql-test/suite/galera/t/galera_var_dirty_reads.test
@@ -64,6 +64,10 @@ USE test;
 SELECT * FROM t1;
 # Cleanup
 DROP TABLE t1;
+set GLOBAL auto_increment_offset = 1;
+
+--connection node_2
+set GLOBAL auto_increment_offset = 2;
 
 --source include/galera_end.inc
 --echo # End of test
diff --git a/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test b/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test
index fe4c358bd89..7f91495fcc4 100644
--- a/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test
+++ b/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test
@@ -6,6 +6,11 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 --connection node_1
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
@@ -26,6 +31,8 @@ INSERT INTO t1 VALUES (3);
 --eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig';
 --enable_query_log
 
+SET SESSION wsrep_sync_wait = 0;
+
 --source include/wait_until_connected_again.inc
 --source include/galera_wait_ready.inc
 
@@ -39,3 +46,5 @@ SELECT COUNT(*) = 4 FROM t1;
 SELECT COUNT(*) = 3 FROM t1;
 
 DROP TABLE t1;
+
+--source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def
index 502e7bfba68..a9b9b00b40c 100644
--- a/mysql-test/suite/galera_3nodes/disabled.def
+++ b/mysql-test/suite/galera_3nodes/disabled.def
@@ -1,8 +1,3 @@
-galera_garbd : Fix the test case
-galera_evs_suspect_timeout : TODO: investigate
-galera_innobackupex_backup : TODO: investigate
 galera_slave_options_do :MDEV-8798
 galera_slave_options_ignore : MDEV-8798
-galera_pc_bootstrap : TODO: Investigate: Timeout in wait_condition.inc
-galera_pc_weight : Test times out
-galera_safe_to_bootstrap : I Really dont know :(
+
diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def
index 605f063f967..8b137891791 100644
--- a/mysql-test/suite/wsrep/disabled.def
+++ b/mysql-test/suite/wsrep/disabled.def
@@ -1 +1 @@
-foreign_key : MDEV-7915
+