diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 13:49:14 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 13:49:14 +0300 |
| commit | 648cf7176cc95f697abd8b94e860c74768680298 (patch) | |
| tree | 8f3d19e0f1bd607cb515111f106715f9a4e6fcec /sql/slave.cc | |
| parent | 7b115181987fb88b97ef6d3d88bb16bdbc281e40 (diff) | |
| parent | 1ecd68d867ced1d00ebffdcedbf6bc97493f5067 (diff) | |
| download | mariadb-git-648cf7176cc95f697abd8b94e860c74768680298.tar.gz | |
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a633722db16..3dee39ad65f 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4950,7 +4950,7 @@ err_during_init: */ if (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"); |