diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-27 18:30:07 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-27 18:30:07 -0400 |
| commit | 7ff44b1a832b005264994cbdfc52f93f69b92cdc (patch) | |
| tree | cc09930e6cab8690a3faf5f5b8d8de02650d08aa /sql/mysqld.h | |
| parent | aa9c8f2a0d5d26103433a6c4bf614559cd4be310 (diff) | |
| download | mariadb-git-7ff44b1a832b005264994cbdfc52f93f69b92cdc.tar.gz | |
MDEV-10161: wsrep_sync_wait not enabled when set to 1 in config file
Since wsrep_sync_wait & wsrep_causal_reads variables are related,
they are always kept in sync whenever one of them changes.
Same is tried on server start, where wsrep_sync_wait get updated
based on wsrep_causal_reads' value. But, since wsrep_causal_reads
is OFF by default, wsrep_sync_wait's value gets modified and loses
its WSREP_SYNC_WAIT_BEFORE_READ bit.
Fixed by syncing wsrep_sync_wait & wsrep_causal_reads values
individually on server start in mysqld_get_one_option() based
on command line arguments used.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 594afac521d..8454f2410dc 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -636,6 +636,10 @@ enum options_mysqld OPT_SSL_KEY, OPT_THREAD_CONCURRENCY, OPT_WANT_CORE, +#ifdef WITH_WSREP + OPT_WSREP_CAUSAL_READS, + OPT_WSREP_SYNC_WAIT, +#endif /* WITH_WSREP */ OPT_MYSQL_COMPATIBILITY, OPT_MYSQL_TO_BE_IMPLEMENTED, OPT_which_is_always_the_last |