diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
| commit | 081fd8bfa280635a7e699a17b035032460cb5160 (patch) | |
| tree | d5ea2c0f31aafe566d749f6dd60f5bc631f60862 /sql/sys_vars.cc | |
| parent | 09cea8703f3ec4e4f9e23855a339c9e3d5e84d3b (diff) | |
| parent | a193c5720ea461ce82390af3fe9c292581242223 (diff) | |
| download | mariadb-git-081fd8bfa280635a7e699a17b035032460cb5160.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 1ec035f35ae..9bb7436b2da 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -5069,6 +5069,19 @@ static Sys_var_mybool Sys_wsrep_certify_nonPK( GLOBAL_VAR(wsrep_certify_nonPK), CMD_LINE(OPT_ARG), DEFAULT(TRUE)); +static const char *wsrep_certification_rules_names[]= { "strict", "optimized", NullS }; +static Sys_var_enum Sys_wsrep_certification_rules( + "wsrep_certification_rules", + "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.", + GLOBAL_VAR(wsrep_certification_rules), CMD_LINE(REQUIRED_ARG), + wsrep_certification_rules_names, DEFAULT(WSREP_CERTIFICATION_RULES_STRICT), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(0)); + static Sys_var_mybool Sys_wsrep_causal_reads( "wsrep_causal_reads", "Setting this variable is equivalent " "to setting wsrep_sync_wait READ flag", |