[Commits] 5247ef25164: Test fixes and disabled.def content rework.

jan jan.lindstrom at mariadb.com
Thu Aug 17 14:44:45 EEST 2017


revision-id: 5247ef25164f820d45d762fce275d965a6d81621 (mariadb-galera-10.0.31-51-g5247ef25164)
parent(s): 7832eff6ff78bb5af3cc3ab8512db783b4bf772f
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-17 14:44:32 +0300
message:

Test fixes and disabled.def content rework.

---
 mysql-test/suite/galera/disabled.def               | 35 ++++++++++++++++++++--
 mysql-test/suite/galera/r/galera#414.result        |  2 ++
 .../r/galera_restart_on_unknown_option.result      |  2 ++
 .../suite/galera/r/galera_var_dirty_reads.result   |  2 ++
 .../r/galera_wsrep_provider_unset_set.result       |  1 +
 mysql-test/suite/galera/suite.pm                   |  6 ++++
 mysql-test/suite/galera/t/galera#414.test          |  3 +-
 .../galera/t/galera_restart_on_unknown_option.test |  6 ++++
 .../suite/galera/t/galera_var_dirty_reads.test     |  4 +++
 .../galera/t/galera_wsrep_provider_unset_set.test  |  2 ++
 10 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index b5d519ba998..94e2f19da8a 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -1,2 +1,33 @@
-MW-336: MDEV-13549 Galera test failures
-galera_gra_log : MDEV-13549 Galera test failures
\ No newline at end of file
+##############################################################################
+#
+#  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
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_restart_on_unknown_option.result b/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
index a21b1edf3e7..998ad345a67 100644
--- a/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
+++ b/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
@@ -38,3 +38,5 @@ f1	f2
 2	d
 3	d
 DROP TABLE t1;
+set GLOBAL auto_increment_offset = 1;
+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..8fda68f0b76 100644
--- a/mysql-test/suite/galera/t/galera#414.test
+++ b/mysql-test/suite/galera/t/galera#414.test
@@ -29,9 +29,10 @@ SET SESSION wsrep_on = ON;
 
 --connection node_1
 CALL mtr.add_suppression("Failed to set packet size");
+set GLOBAL auto_increment_offset = 1;
 
 --connection node_2
 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready';
 --source include/wait_condition.inc
 CALL mtr.add_suppression("Failed to set packet size");
-
+set GLOBAL auto_increment_offset = 2;
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..51b2ad429a0 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
@@ -126,6 +126,12 @@ SELECT * FROM t1;
 
 DROP TABLE t1;
 
+set GLOBAL auto_increment_offset = 1;
+
+--connection node_2
+
+set GLOBAL auto_increment_offset = 2;
+
 #
 # We should count the number of "Assertion failed" warnings
 # in the log file during test phase - to print the error message
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..b82d111723c 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
@@ -26,6 +26,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
 


More information about the commits mailing list