diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-10 18:30:42 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-10 18:30:42 +0300 |
| commit | 8b92c642981e7b226e0d93b958cc470bb1e6fad0 (patch) | |
| tree | 12fd42cc03a1f054ea0575a232ce22d7cd3292f0 | |
| parent | 48924ae9c5660396f0bc8a1f56abcaa3c3d6a501 (diff) | |
| download | mariadb-git-8b92c642981e7b226e0d93b958cc470bb1e6fad0.tar.gz | |
Fix tests affected by new configuration variable on Galera.
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 7 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/all_vars.result | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 5b25b4d01a7..aff1cb6bace 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -866,6 +866,12 @@ The following specify which files/extra groups are read (specified before remain --wsrep-causal-reads (DEPRECATED) Setting this variable is equivalent to setting wsrep_sync_wait READ flag + --wsrep-certification-rules=name + 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. --wsrep-certify-nonPK Certify tables with no primary key (Defaults to on; use --skip-wsrep-certify-nonPK to disable.) @@ -1198,6 +1204,7 @@ wait-timeout 28800 wsrep-OSU-method TOI wsrep-auto-increment-control TRUE wsrep-causal-reads FALSE +wsrep-certification-rules strict wsrep-certify-nonPK TRUE wsrep-cluster-address wsrep-cluster-name my_wsrep_cluster 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; |