diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-09-23 13:53:57 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-09-23 13:53:57 +0300 |
| commit | 87dc4e98dda26ff99a3b3aeae2fce9fd2f2fdf24 (patch) | |
| tree | c90894706f302f6a37888116a4fc60406d354371 /mysql-test | |
| parent | eefaf4fdc9ea059a147c39cbc5c14b05bb8aa338 (diff) | |
| download | mariadb-git-87dc4e98dda26ff99a3b3aeae2fce9fd2f2fdf24.tar.gz | |
MDEV-17276: Adjust Galera tests after Galera library 25.3.24
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/r/galera#505.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 94b4add1eec..92e45cc0f25 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -33,3 +33,4 @@ galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan + diff --git a/mysql-test/suite/galera/r/galera#505.result b/mysql-test/suite/galera/r/galera#505.result index 9ae09cac187..3a72c843514 100644 --- a/mysql-test/suite/galera/r/galera#505.result +++ b/mysql-test/suite/galera/r/galera#505.result @@ -1,3 +1,5 @@ +SET SESSION wsrep_sync_wait=0; +SET SESSION wsrep_sync_wait=DEFAULT; SET GLOBAL wsrep_provider_options = 'pc.weight=3'; SHOW GLOBAL VARIABLES LIKE 'wsrep_provider_options'; Variable_name Value diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 1dafa6b5ed5..d11cffba116 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -60,6 +60,8 @@ wsrep_local_send_queue_min # wsrep_local_state # wsrep_local_state_comment # wsrep_local_state_uuid # +wsrep_open_connections # +wsrep_open_transactions # wsrep_protocol_version # wsrep_provider_name # wsrep_provider_vendor # |