diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-04-21 13:17:17 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-08 17:43:57 -0400 |
commit | 3331d4e07efca993b3f34fa06b8a03b41b6b690d (patch) | |
tree | 33ec8ad535c4003ce4e7bda050641cb748b35a04 /mysql-test/suite/wsrep | |
parent | 608a1ce5b184f617d45c69095e1fae7b39402853 (diff) | |
download | mariadb-git-3331d4e07efca993b3f34fa06b8a03b41b6b690d.tar.gz |
Merge galera tests from github.com/codership/mysql-wsrep
Diffstat (limited to 'mysql-test/suite/wsrep')
-rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 8 | ||||
-rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index bd6f0d4adb7..9c047177ca8 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -35,8 +35,12 @@ wsrep_local_commits # wsrep_local_cert_failures # wsrep_local_replays # wsrep_local_send_queue # +wsrep_local_send_queue_max # +wsrep_local_send_queue_min # wsrep_local_send_queue_avg # wsrep_local_recv_queue # +wsrep_local_recv_queue_max # +wsrep_local_recv_queue_min # wsrep_local_recv_queue_avg # wsrep_local_cached_downto # wsrep_flow_control_paused_ns # @@ -86,8 +90,12 @@ wsrep_local_commits # wsrep_local_cert_failures # wsrep_local_replays # wsrep_local_send_queue # +wsrep_local_send_queue_max # +wsrep_local_send_queue_min # wsrep_local_send_queue_avg # wsrep_local_recv_queue # +wsrep_local_recv_queue_max # +wsrep_local_recv_queue_min # wsrep_local_recv_queue_avg # wsrep_local_cached_downto # wsrep_flow_control_paused_ns # diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index ec405969eba..6922e2d1444 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -28,7 +28,7 @@ CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*") --disable_query_log eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; ---let $galera_version=25.3.5 +--let $galera_version=3.9 source include/check_galera_version.inc; --enable_query_log |