diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-12 18:23:53 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-12 18:23:53 -0400 |
| commit | 5add5855390fde8b8e8730c244d149123d8cf7ec (patch) | |
| tree | 425039d7a0bcd37512cf67efb91f28208b0ba8e5 /sql/sys_vars.cc | |
| parent | e1facda416897c35b9dde90a14d3578f3ca2df9b (diff) | |
| download | mariadb-git-5add5855390fde8b8e8730c244d149123d8cf7ec.tar.gz | |
Merged r4014 from codership/5.5
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 5ad40f2c147..703ece33872 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3865,9 +3865,21 @@ static Sys_var_mybool Sys_wsrep_certify_nonPK( CMD_LINE(OPT_ARG), DEFAULT(TRUE)); static Sys_var_mybool Sys_wsrep_causal_reads( - "wsrep_causal_reads", "Enable \"strictly synchronous\" semantics for read operations", + "wsrep_causal_reads", "(DEPRECATED) setting this variable is equivalent to setting wsrep_sync_wait READ flag", SESSION_VAR(wsrep_causal_reads), - CMD_LINE(OPT_ARG), DEFAULT(FALSE)); + CMD_LINE(OPT_ARG), DEFAULT(FALSE), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(wsrep_causal_reads_update)); + +static Sys_var_uint Sys_wsrep_sync_wait( + "wsrep_sync_wait", "Ensure \"synchronous\" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE", + SESSION_VAR(wsrep_sync_wait), + CMD_LINE(OPT_ARG), + VALID_RANGE(WSREP_SYNC_WAIT_NONE, WSREP_SYNC_WAIT_MAX), + DEFAULT(WSREP_SYNC_WAIT_NONE), + BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(wsrep_sync_wait_update)); static const char *wsrep_OSU_method_names[]= { "TOI", "RSU", NullS }; static Sys_var_enum Sys_wsrep_OSU_method( |