bzr merge -r4089..4091 codership/5.6

0bf3ed12 · Nirbhay Choubey · 0b98d2fd · 0bf3ed12
Commit 0bf3ed12 authored May 21, 2014 by Nirbhay Choubey
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/sql_parse.cc sql/sql_parse.cc +3 -0

No files found.
--- 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;
  }