revision-id: 13c4e2bc10471dda9ec3886e7413a3669a5358da (mariadb-10.1.35-36-g13c4e2bc104) parent(s): 3b0ac8fa013d0a56bce736fb4283a35409394d71 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-06 13:18:34 +0300 message: Disable changing output and fix version requirement. --- mysql-test/suite/galera/r/galera_defaults.result | 5 ++++- mysql-test/suite/galera/t/galera_defaults.test | 2 +- mysql-test/suite/wsrep/r/variables.result | 1 - mysql-test/suite/wsrep/t/variables.test | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index 5c5fdabf432..38fb224d6e0 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -57,7 +57,7 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'wsrep_%' AND VARIABLE_NAME != 'wsrep_debug_sync_waiters'; COUNT(*) -58 +61 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'wsrep_%' AND VARIABLE_NAME != 'wsrep_debug_sync_waiters' @@ -74,6 +74,7 @@ WSREP_CLUSTER_CONF_ID WSREP_CLUSTER_SIZE WSREP_CLUSTER_STATE_UUID WSREP_CLUSTER_STATUS +WSREP_CLUSTER_WEIGHT WSREP_COMMIT_OOOE WSREP_COMMIT_OOOL WSREP_COMMIT_WINDOW @@ -107,6 +108,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 diff --git a/mysql-test/suite/galera/t/galera_defaults.test b/mysql-test/suite/galera/t/galera_defaults.test index facc5180f2f..70929f547f8 100644 --- a/mysql-test/suite/galera/t/galera_defaults.test +++ b/mysql-test/suite/galera/t/galera_defaults.test @@ -13,7 +13,7 @@ # Make sure that the test is operating on the right version of galera library. --disable_query_log ---let $galera_version=3.20 +--let $galera_version=25.3.20 source ../wsrep/include/check_galera_version.inc; --enable_query_log diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 7489aa0d914..2e31e761f5f 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -19,7 +19,6 @@ SET GLOBAL wsrep_provider=none; # variables when using "_" # CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*"); -SET GLOBAL wsrep_provider= '/usr/lib/galera/libgalera_smm.so'; SHOW GLOBAL STATUS LIKE 'wsrep%'; Variable_name Value wsrep_apply_oooe # diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index ca71baaba02..f3cd66e5cf9 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -28,10 +28,12 @@ SET GLOBAL wsrep_provider=none; CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*"); --disable_result_log +--disable_query_log eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; --let $galera_version=25.3.17 source include/check_galera_version.inc; --enable_result_log +--enable_query_log --replace_column 2 # SHOW GLOBAL STATUS LIKE 'wsrep%';