diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 23:47:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 23:47:39 +0200 |
| commit | b942aa34c10ddfa3fe4977ae60afed5cbdc51083 (patch) | |
| tree | 0a1a934ca7b728e3ffb81cd2f7c6a858524726d4 /sql/slave.cc | |
| parent | fe3f9fa9183ea3d10397b6f7f4d422ae9bba00a4 (diff) | |
| parent | c09a8b5b36edb494e2bcc93074c06e26cd9f2b92 (diff) | |
| download | mariadb-git-b942aa34c10ddfa3fe4977ae60afed5cbdc51083.tar.gz | |
Merge branch '10.1' into 10.2
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 713a668bfe8..7e52822ca51 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5295,7 +5295,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"); |