diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-07-04 11:41:09 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-07-04 11:41:09 +0300 |
| commit | 006cb2a6f95f96e67acc4e8ed7e2ecd97d4678e7 (patch) | |
| tree | ef7443bb31e7898c547cec342137fc3fe2fd601d /sql | |
| parent | fbf39746525358269b29d05b2ce696e7ff60cbcd (diff) | |
| download | mariadb-git-006cb2a6f95f96e67acc4e8ed7e2ecd97d4678e7.tar.gz | |
Merge -r4102..4103 codership/5.6/
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 353704930a5..dff2dea8983 100644 --- 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; |