From 76fbe724545489530fe5f9e18a19e0e422ccbefa Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 30 Aug 2018 14:52:07 +0300 Subject: [PATCH] MXS-2011 Fix rebase bug --- server/modules/routing/binlogrouter/blr_slave.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc index 1ef6f1c9b..fbbce5a90 100644 --- a/server/modules/routing/binlogrouter/blr_slave.cc +++ b/server/modules/routing/binlogrouter/blr_slave.cc @@ -4342,7 +4342,7 @@ int blr_apply_change_master_0(ROUTER_INSTANCE* router, if (ssl_error != -1 && // No CA cert is defined or only one of CERT or KEY is defined - (new_config.ssl_ca.empty() || new_config.ssl_cert.empty() != new_config.ssl_key.empty()) + (new_config.ssl_ca.empty() || new_config.ssl_cert.empty() != new_config.ssl_key.empty())) { if (new_config.ssl_enabled) {