database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge branch '10.0-galera' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2018-06-12 19:39:37 +03:00
parent aa59ecec89 215d652c66
commit 6e55236c0a
51 changed files with 590 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/slave.cc
View File

@@ -5128,7 +5128,7 @@ err_during_init:
*/
if (WSREP_ON && wsrep_node_dropped && wsrep_restart_slave)
{
if (wsrep_ready)
if (wsrep_ready_get())
{
WSREP_INFO("Slave error due to node temporarily non-primary"
"SQL slave will continue");