diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-31 09:34:34 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-31 09:34:34 +0100 |
| commit | 560799ebd8efe11f4c4ae1bb9ed4d39185e03800 (patch) | |
| tree | 58158a4194a2473679c1848c323bad918542c5c9 /mysql-test/suite/sys_vars | |
| parent | 6e2af7d084ca1bba79e60f05616aaefb6028ee9d (diff) | |
| parent | c2caca02ac39454e18db8de563e7e7c8eaf8b1c7 (diff) | |
| download | mariadb-git-560799ebd8efe11f4c4ae1bb9ed4d39185e03800.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'mysql-test/suite/sys_vars')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/all_vars.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result index 1bd4e394f6a..b7beb7b5347 100644 --- a/mysql-test/suite/sys_vars/r/all_vars.result +++ b/mysql-test/suite/sys_vars/r/all_vars.result @@ -10,5 +10,6 @@ there should be *no* long test name listed below: select distinct variable_name as `there should be *no* variables listed below:` from t2 left join t1 on variable_name=test_name where test_name is null; there should be *no* variables listed below: +wsrep_certification_rules drop table t1; drop table t2; diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index db932ae8223..e54afd2d64a 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -29,6 +29,20 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME WSREP_CERTIFICATION_RULES +SESSION_VALUE NULL +GLOBAL_VALUE strict +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE strict +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE ENUM +VARIABLE_COMMENT Certification rules to use in the cluster. Possible values are: "strict": stricter rules that could result in more certification failures. "optimized": relaxed rules that allow more concurrency and cause less certification failures. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST strict,optimized +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME WSREP_CERTIFY_NONPK SESSION_VALUE NULL GLOBAL_VALUE ON |