Merge -r4102..4103 codership/5.6/

006cb2a6 · Jan Lindström · fbf39746 · 006cb2a6
Commit 006cb2a6 authored Jul 04, 2014 by Jan Lindström
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/wsrep_mysqld.cc sql/wsrep_mysqld.cc +1 -1

No files found.
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -380,7 +380,7 @@ wsrep_view_handler_cb (void*                    app_ctx,
  }
 out:
-  wsrep_startup= FALSE;
+  if (view->status == WSREP_VIEW_PRIMARY) wsrep_startup= FALSE;
  local_status.set(new_status, view);
  return WSREP_CB_SUCCESS;