diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-26 16:23:56 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-26 16:23:56 -0400 |
| commit | 9d15afdb6156402c7763302c843b94a4c69ad250 (patch) | |
| tree | e405d20b784478472ee487ab7663744eaa92b2d7 /sql | |
| parent | 9b506d4bcb11c0df32993df27597afbedf1eb2ed (diff) | |
| download | mariadb-git-9d15afdb6156402c7763302c843b94a4c69ad250.tar.gz | |
Merged fix for MDEV-6646 from maria-5.5-galera.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d12477e81f2..70441b1bcc0 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1614,6 +1614,14 @@ void THD::init(void) wsrep_TOI_pre_query = NULL; wsrep_TOI_pre_query_len = 0; + + /* + @@wsrep_causal_reads is now being handled via wsrep_sync_wait, update it + appropriately. + */ + if (variables.wsrep_causal_reads) + variables.wsrep_sync_wait|= WSREP_SYNC_WAIT_BEFORE_READ; + #endif if (variables.sql_log_bin) variables.option_bits|= OPTION_BIN_LOG; |