hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1209: var name fix

Browse Source 
var name fix
This commit is contained in:
MassimilianoPinto
2017-05-07 12:19:31 +02:00
parent ab89685075
commit 63caab2ece
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/routing/binlogrouter/blr.c
View File

@ -701,11 +701,12 @@ createInstance(SERVICE *service, char **options)
if (!inst->mariadb10_compat && if (!inst->mariadb10_compat &&
inst->mariadb10_master_gtid) inst->mariadb10_master_gtid)
{ {
MXS_ERROR("MariaDB Master GTID registration needs" MXS_WARNING("MariaDB Master GTID registration needs"
" MariaDB compatibilty option." " MariaDB compatibilty option. The 'mariadb10-compatibility'"
" Please enable it with option 'mariadb10-compatibility=On'"); " has been turned on. Please permanently enable it with option"
free_instance(inst); " 'mariadb10-compatibility=On'");
return NULL;
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")); 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]) router_inst->last_mariadb_gtid[0])
{ {
json_object_set_new(rval, "latest_gtid", json_string(router_inst->last_mariadb_gtid)); json_object_set_new(rval, "latest_gtid", json_string(router_inst->last_mariadb_gtid));

6
server/modules/routing/binlogrouter/blr_master.c
View File

@ -3087,11 +3087,7 @@ static bool blr_handle_fake_rotate(ROUTER_INSTANCE *router,
spinlock_release(&router->binlog_lock); spinlock_release(&router->binlog_lock);
if (!blr_rotate_event(router, ptr, hdr)) return blr_rotate_event(router, ptr, hdr);
{
return false;
}
return true;
} }
/** /**