diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-25 15:39:39 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-25 15:39:39 -0400 |
| commit | 90266e8a0eb46867c990930fa4d305d2424929ba (patch) | |
| tree | 787918cf537c678ab4f7a949520c847fa3fd8442 /mysql-test/suite/sys_vars | |
| parent | dfa3046db48d8439cf3eb02ba6623fe2f6e44f91 (diff) | |
| parent | b506d9527b4303b91f69fe6b6f21f911e5bfef72 (diff) | |
| download | mariadb-git-90266e8a0eb46867c990930fa4d305d2424929ba.tar.gz | |
Merge branch '10.0-galera' into bb-10.1-serg
Diffstat (limited to 'mysql-test/suite/sys_vars')
4 files changed, 13 insertions, 7 deletions
diff --git a/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result b/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result index 52fede2f538..e4d452c11b5 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result +++ b/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result @@ -20,10 +20,12 @@ SET @@global.wsrep_desync=ON; Got one of the listed errors SELECT @@global.wsrep_desync; @@global.wsrep_desync -1 +0 # valid values SET @@global.wsrep_desync='OFF'; +Warnings: +Warning 1231 'wsrep_desync' is already OFF. SELECT @@global.wsrep_desync; @@global.wsrep_desync 0 @@ -31,8 +33,10 @@ SET @@global.wsrep_desync=ON; Got one of the listed errors SELECT @@global.wsrep_desync; @@global.wsrep_desync -1 +0 SET @@global.wsrep_desync=default; +Warnings: +Warning 1231 'wsrep_desync' is already OFF. SELECT @@global.wsrep_desync; @@global.wsrep_desync 0 diff --git a/mysql-test/suite/sys_vars/r/wsrep_max_ws_rows_basic.result b/mysql-test/suite/sys_vars/r/wsrep_max_ws_rows_basic.result index 15438a2afd5..d96bc8708c5 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_max_ws_rows_basic.result +++ b/mysql-test/suite/sys_vars/r/wsrep_max_ws_rows_basic.result @@ -6,7 +6,7 @@ SET @wsrep_max_ws_rows_global_saved = @@global.wsrep_max_ws_rows; # default SELECT @@global.wsrep_max_ws_rows; @@global.wsrep_max_ws_rows -131072 +0 # scope SELECT @@session.wsrep_max_ws_rows; @@ -26,11 +26,9 @@ SELECT @@global.wsrep_max_ws_rows; @@global.wsrep_max_ws_rows 131073 SET @@global.wsrep_max_ws_rows=0; -Warnings: -Warning 1292 Truncated incorrect wsrep_max_ws_rows value: '0' SELECT @@global.wsrep_max_ws_rows; @@global.wsrep_max_ws_rows -1 +0 SET @@global.wsrep_max_ws_rows=default; SELECT @global.wsrep_max_ws_rows; @global.wsrep_max_ws_rows diff --git a/mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result b/mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result index 26d8d823a5c..d7e72869be3 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result +++ b/mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result @@ -3,10 +3,11 @@ # # save the initial value SET @wsrep_max_ws_size_global_saved = @@global.wsrep_max_ws_size; +SET @wsrep_provider_options_saved = @@global.wsrep_provider_options; # default SELECT @@global.wsrep_max_ws_size; @@global.wsrep_max_ws_size -1073741824 +2147483647 # scope SELECT @@session.wsrep_max_ws_size; @@ -55,4 +56,5 @@ NULL # restore the initial value SET @@global.wsrep_max_ws_size = @wsrep_max_ws_size_global_saved; +SET @@global.wsrep_provider_options = @wsrep_provider_options_saved; # End of test diff --git a/mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test b/mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test index e7af4558f24..2e302015136 100644 --- a/mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test +++ b/mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test @@ -6,6 +6,7 @@ --echo # save the initial value SET @wsrep_max_ws_size_global_saved = @@global.wsrep_max_ws_size; +SET @wsrep_provider_options_saved = @@global.wsrep_provider_options; --echo # default SELECT @@global.wsrep_max_ws_size; @@ -41,5 +42,6 @@ SELECT @global.wsrep_max_ws_size; --echo --echo # restore the initial value SET @@global.wsrep_max_ws_size = @wsrep_max_ws_size_global_saved; +SET @@global.wsrep_provider_options = @wsrep_provider_options_saved; --echo # End of test |