From 0bf3ed12a5338f0db4b652f839fee93a28d39195 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Wed, 21 May 2014 18:10:43 -0400
Subject: [PATCH] bzr merge -r4089..4091 codership/5.6

---
 sql/sql_parse.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 039e79c2acf..8da8fdf5c25 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2761,6 +2761,9 @@ mysql_execute_command(THD *thd)
 #endif
   case SQLCOM_SHOW_STATUS:
   {
+#ifdef WITH_WSREP
+    if (WSREP_CLIENT(thd) && wsrep_causal_wait(thd)) goto error;
+#endif /* WITH_WSREP */
     execute_show_status(thd, all_tables);
     break;
   }