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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Johan Wikman
2017-08-14 10:36:34 +03:00
parent 9d3772a67e 7021041804
commit 4798810f76
11 changed files with 181 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,6 +211,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
{"master_uuid", MXS_MODULE_PARAM_STRING},
{"master_version", MXS_MODULE_PARAM_STRING},
{"master_hostname", MXS_MODULE_PARAM_STRING},
{"slave_hostname", MXS_MODULE_PARAM_STRING},
{"mariadb10-compatibility", MXS_MODULE_PARAM_BOOL, "false"},
{"maxwell-compatibility", MXS_MODULE_PARAM_BOOL, "false"},
{"filestem", MXS_MODULE_PARAM_STRING, BINLOG_NAME_ROOT},
@ -372,6 +373,7 @@ createInstance(SERVICE *service, char **options)
inst->trx_safe = config_get_bool(params, "transaction_safety");
inst->set_master_version = config_copy_string(params, "master_version");
inst->set_master_hostname = config_copy_string(params, "master_hostname");
inst->set_slave_hostname = config_copy_string(params, "slave_hostname");
inst->fileroot = config_copy_string(params, "filestem");
inst->serverid = config_get_integer(params, "server_id");
@ -382,8 +384,6 @@ createInstance(SERVICE *service, char **options)
inst->master_uuid = config_copy_string(params, "master_uuid");
inst->set_master_uuid = inst->master_uuid != NULL;
inst->set_master_version = NULL;
inst->set_master_hostname = NULL;
inst->send_slave_heartbeat = config_get_bool(params, "send_slave_heartbeat");
/* Semi-Sync support */
@ -538,6 +538,11 @@ createInstance(SERVICE *service, char **options)
MXS_FREE(inst->set_master_hostname);
inst->set_master_hostname = MXS_STRDUP_A(value);
}
else if (strcmp(options[i], "slave_hostname") == 0)
{
MXS_FREE(inst->set_slave_hostname);
inst->set_slave_hostname = MXS_STRDUP_A(value);
}
else if (strcmp(options[i], "mariadb10-compatibility") == 0)
{
inst->mariadb10_compat = config_truth_value(value);
@ -1154,6 +1159,7 @@ free_instance(ROUTER_INSTANCE *instance)
MXS_FREE(instance->password);
MXS_FREE(instance->set_master_version);
MXS_FREE(instance->set_master_hostname);
MXS_FREE(instance->set_slave_hostname);
MXS_FREE(instance->fileroot);
MXS_FREE(instance->binlogdir);
/* SSL options */