diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-21 13:35:00 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-21 13:35:00 +0300 |
| commit | c23efc7d50530570e6c13207f3c76adcb9237346 (patch) | |
| tree | 7c57ca7a1dc61590019abb5608c2b19327f8ed7c /sql/sys_vars.cc | |
| parent | 06106c01481401b6d7ef4309391ca2f66242cc85 (diff) | |
| parent | f1af2114993f884b1a6dc34fb1d972ead08f1966 (diff) | |
| download | mariadb-git-c23efc7d50530570e6c13207f3c76adcb9237346.tar.gz | |
Merge remote-tracking branch 'origin/10.0-galera' into 10.1
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index e0b8b522610..8eb3d35a96e 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4817,7 +4817,7 @@ static Sys_var_ulong Sys_wsrep_slave_threads( GLOBAL_VAR(wsrep_slave_threads), CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, 512), DEFAULT(1), BLOCK_SIZE(1), &PLock_wsrep_slave_threads, NOT_IN_BINLOG, - ON_CHECK(wsrep_slave_threads_check), + ON_CHECK(NULL), ON_UPDATE(wsrep_slave_threads_update)); static Sys_var_charptr Sys_wsrep_dbug_option( @@ -4929,21 +4929,13 @@ static Sys_var_mybool Sys_wsrep_certify_nonPK( GLOBAL_VAR(wsrep_certify_nonPK), CMD_LINE(OPT_ARG), DEFAULT(TRUE)); -static bool fix_wsrep_causal_reads(sys_var *self, THD* thd, enum_var_type var_type) -{ - if (var_type == OPT_GLOBAL) - wsrep_causal_reads_update(&global_system_variables); - else - wsrep_causal_reads_update(&thd->variables); - return false; -} static Sys_var_mybool Sys_wsrep_causal_reads( "wsrep_causal_reads", "Setting this variable is equivalent " "to setting wsrep_sync_wait READ flag", SESSION_VAR(wsrep_causal_reads), CMD_LINE(OPT_ARG, OPT_WSREP_CAUSAL_READS), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_wsrep_causal_reads), + ON_UPDATE(wsrep_causal_reads_update), DEPRECATED("'@@wsrep_sync_wait=1'")); static Sys_var_uint Sys_wsrep_sync_wait( |