diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-06 00:29:37 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-06 00:29:37 +0200 |
| commit | 2b4183f10b54a5b3f8c848d897b3107859c23fa4 (patch) | |
| tree | 5d48ff3f0a9814926ba59b7adae1d056c57b54c8 /sql/sys_vars.cc | |
| parent | 9129c8f1d3e1f8c9daeae559eaf6b9807b4331ec (diff) | |
| download | mariadb-git-2b4183f10b54a5b3f8c848d897b3107859c23fa4.tar.gz | |
bzr merge -r3890..3891 lp:codership-mysql/5.5
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 00be8bfbc21..e1b0dc50c65 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4063,7 +4063,8 @@ static Sys_var_tz Sys_time_zone( DEFAULT(&default_tz), NO_MUTEX_GUARD, IN_BINLOG); #ifdef WITH_WSREP -#include "wsrep_mysqld.h" +#include "wsrep_var.h" +#include "wsrep_sst.h" static Sys_var_charptr Sys_wsrep_provider( "wsrep_provider", "Path to replication provider library", @@ -4244,8 +4245,7 @@ static Sys_var_mybool Sys_wsrep_certify_nonPK( static Sys_var_mybool Sys_wsrep_causal_reads( "wsrep_causal_reads", "Enable \"strictly synchronous\" semantics for read operations", SESSION_VAR(wsrep_causal_reads), - CMD_LINE(OPT_ARG), DEFAULT(FALSE)); - // ON_UPDATE(wsrep_causal_reads_update)); + CMD_LINE(OPT_ARG), DEFAULT(FALSE)); static const char *wsrep_OSU_method_names[]= { "TOI", "RSU", NullS }; static Sys_var_enum Sys_wsrep_OSU_method( |