File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -484,8 +484,7 @@ int wsrep_init()
484
484
WSREP_ERROR (" wsrep_load(%s) failed: %s (%d). Reverting to no provider." ,
485
485
wsrep_provider, strerror (rcode), rcode);
486
486
strcpy ((char *)wsrep_provider, WSREP_NONE); // damn it's a dirty hack
487
- (void ) wsrep_init ();
488
- return rcode;
487
+ return wsrep_init ();
489
488
}
490
489
else /* this is for recursive call above */
491
490
{
@@ -671,6 +670,9 @@ void wsrep_init_startup (bool first)
671
670
wsrep_thr_lock_init (wsrep_thd_is_BF, wsrep_abort_thd,
672
671
wsrep_debug, wsrep_convert_LOCK_to_trx, wsrep_on);
673
672
673
+ /* Skip replication start if dummy wsrep provider is loaded */
674
+ if (!strcmp (wsrep_provider, WSREP_NONE)) return ;
675
+
674
676
/* Skip replication start if no cluster address */
675
677
if (!wsrep_cluster_address || strlen (wsrep_cluster_address) == 0 ) return ;
676
678
You can’t perform that action at this time.
0 commit comments