diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-16 13:52:30 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-16 13:52:30 -0500 |
| commit | bb93d46241d4c563844ffd7455ac2336a28bd66f (patch) | |
| tree | 365bf33402a1ee873ff6ebda74b6aec6f7d6b38f /mysql-test/suite/wsrep/r | |
| parent | 33b4fab8679a2e34a97e167a2a88dc5ea0a5686a (diff) | |
| download | mariadb-git-bb93d46241d4c563844ffd7455ac2336a28bd66f.tar.gz | |
Test changes (backported from 10.1).
Diffstat (limited to 'mysql-test/suite/wsrep/r')
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 675cdf724cc..5117dd1b048 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -1,3 +1,4 @@ +SET @wsrep_provider_options_saved= @@global.wsrep_provider_options; # MDEV#5534: mysql_tzinfo_to_sql generates wrong query # @@ -72,10 +73,6 @@ Threads_connected 1 SHOW STATUS LIKE 'wsrep_thread_count'; Variable_name Value wsrep_thread_count 11 -SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved; -SET GLOBAL wsrep_provider= none; -SET GLOBAL wsrep_cluster_address= ''; -SET GLOBAL wsrep_provider_options= ''; # # MDEV#6411: Setting set @@global.wsrep_sst_auth=NULL causes crash # @@ -93,4 +90,8 @@ SELECT @@global.wsrep_sst_auth; @@global.wsrep_sst_auth NULL SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved; +SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved; +SET GLOBAL wsrep_provider= none; +SET GLOBAL wsrep_cluster_address= ''; +SET GLOBAL wsrep_provider_options= @wsrep_provider_options_saved; # End of test. |