diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 19:39:37 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 19:39:37 +0300 |
commit | 6e55236c0a72e8f49a240c4e080591994042b0e4 (patch) | |
tree | 4bb2f438004db3dbba5f88f5e4b00aacfd5c1cec /sql/slave.cc | |
parent | aa59ecec89d89a29f7272352471a4064aa6db28c (diff) | |
parent | 215d652c66474c4578b0476385d055e7feae2d3a (diff) | |
download | mariadb-git-6e55236c0a72e8f49a240c4e080591994042b0e4.tar.gz |
Merge branch '10.0-galera' into 10.1
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 ed679dfdf80..6fe6de6872a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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"); |