summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-09-06 16:34:25 +0200
committerSergei Golubchik <serg@mariadb.org>2016-09-06 16:34:25 +0200
commit8494039757a2f6353cc161e7824aab4fe2312d2a (patch)
treefa5d15245786ebe0a908a2b67329793e44ab9df5
parent61fd38a1de5b24b1b86e42a191379cddd782404d (diff)
downloadmariadb-git-8494039757a2f6353cc161e7824aab4fe2312d2a.tar.gz
fix the test to work
without preceding sys_vars.wsrep_provider_basic
-rw-r--r--mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result1
-rw-r--r--mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test2
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result b/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result
index 5ef36180de5..b2e07c55b38 100644
--- a/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result
+++ b/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result
@@ -2,6 +2,7 @@
# wsrep_provider_options
#
call mtr.add_suppression("WSREP: Failed to get provider options");
+SET @@global.wsrep_provider = @@global.wsrep_provider;
# save the initial value
SET @wsrep_provider_options_global_saved = @@global.wsrep_provider_options;
# default
diff --git a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test b/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test
index 73ec4ffc846..d2ea32a0637 100644
--- a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test
+++ b/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test
@@ -6,6 +6,8 @@
call mtr.add_suppression("WSREP: Failed to get provider options");
+SET @@global.wsrep_provider = @@global.wsrep_provider;
+
--echo # save the initial value
SET @wsrep_provider_options_global_saved = @@global.wsrep_provider_options;