diff options
| author | Ian Gilfillan <github@greenman.co.za> | 2017-11-23 14:02:36 +0200 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-11-29 12:23:44 +0400 |
| commit | e6e026ae51a77969749de201d491a176483bbc69 (patch) | |
| tree | 9e2cc3343518fe10d1abead721fd145cb1a64dd9 | |
| parent | 22936df631633be2b136e6bf9a88b66e94fa1402 (diff) | |
| download | mariadb-git-e6e026ae51a77969749de201d491a176483bbc69.tar.gz | |
Update wsrep_sync_wait documentation as per MW-86
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 4 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 34d4bae0f28..91131870752 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -942,8 +942,8 @@ The following options may be given as the first argument: --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 + READ(includes SELECT and BEGIN/START TRANSACTION); 2 - + UPDATE and DELETE; 4 - INSERT and REPLACE; 8 - SHOW Variables (--variable-name=value) allow-suspicious-udfs FALSE diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index a0475c136ae..53b606c0336 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3897,8 +3897,8 @@ static Sys_var_mybool Sys_wsrep_causal_reads( 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", + "SELECT and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - " + "INSERT and REPLACE; 8 - SHOW", 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), |