From aece04a02c25386485c77e7140ab33e51473e366 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Tue, 26 Aug 2014 15:56:03 -0400
Subject: [PATCH] MDEV-6646 : global.wsrep_causal_reads no longer honored

During THD initialization, the value of wsrep_causal_reads (now
being exclusively handled via wsrep_sync_wait, lp:1277053) was
being ignored. Fixed by updating wsrep_sync_wait appropriately.
---
 sql/sql_class.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 348dd488d2a..14821f0e027 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1484,6 +1484,14 @@ void THD::init(void)
   wsrep_bf_thd = NULL;
   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;