From 63caab2ecebe2dfcabb4ad07e4f04e538d72aff7 Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Sun, 7 May 2017 12:19:31 +0200 Subject: [PATCH] MXS-1209: var name fix var name fix --- server/modules/routing/binlogrouter/blr.c | 13 +++++++------ server/modules/routing/binlogrouter/blr_master.c | 6 +----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/server/modules/routing/binlogrouter/blr.c b/server/modules/routing/binlogrouter/blr.c index d8dd78bde..704cff599 100644 --- a/server/modules/routing/binlogrouter/blr.c +++ b/server/modules/routing/binlogrouter/blr.c @@ -701,11 +701,12 @@ createInstance(SERVICE *service, char **options) if (!inst->mariadb10_compat && inst->mariadb10_master_gtid) { - MXS_ERROR("MariaDB Master GTID registration needs" - " MariaDB compatibilty option." - " Please enable it with option 'mariadb10-compatibility=On'"); - free_instance(inst); - return NULL; + MXS_WARNING("MariaDB Master GTID registration needs" + " MariaDB compatibilty option. The 'mariadb10-compatibility'" + " has been turned on. Please permanently enable it with option" + " 'mariadb10-compatibility=On'"); + + inst->mariadb10_compat = true; } /** @@ -1912,7 +1913,7 @@ static json_t* diagnostics_json(const MXS_ROUTER *router) json_object_set_new(rval, "latest_event_type", json_string((ptr != NULL) ? ptr : "unknown")); - if (router_inst->mariadb_gtid && + if (router_inst->mariadb10_gtid && router_inst->last_mariadb_gtid[0]) { json_object_set_new(rval, "latest_gtid", json_string(router_inst->last_mariadb_gtid)); diff --git a/server/modules/routing/binlogrouter/blr_master.c b/server/modules/routing/binlogrouter/blr_master.c index 12e51da8c..7707916c9 100644 --- a/server/modules/routing/binlogrouter/blr_master.c +++ b/server/modules/routing/binlogrouter/blr_master.c @@ -3087,11 +3087,7 @@ static bool blr_handle_fake_rotate(ROUTER_INSTANCE *router, spinlock_release(&router->binlog_lock); - if (!blr_rotate_event(router, ptr, hdr)) - { - return false; - } - return true; + return blr_rotate_event(router, ptr, hdr); } /**