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

Develop Merge

Browse Source 
Develop Merge
This commit is contained in:
MassimilianoPinto
2017-06-30 10:48:13 +02:00
parent 2c5aaeff0e 086e7abe77
commit 7913f0ddf1
14 changed files with 61 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/avrorouter/avro.c
View File

@ -201,7 +201,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
{"group_rows", MXS_MODULE_PARAM_COUNT, "1000"},
{"group_trx", MXS_MODULE_PARAM_COUNT, "1"},
{"start_index", MXS_MODULE_PARAM_COUNT, "1"},
{"block_size", MXS_MODULE_PARAM_COUNT, "0"},
{"block_size", MXS_MODULE_PARAM_SIZE, "0"},
{"codec", MXS_MODULE_PARAM_ENUM, "null", MXS_MODULE_OPT_ENUM_UNIQUE, codec_values},
{MXS_END_MODULE_PARAMS}
}
@ -425,7 +425,7 @@ createInstance(SERVICE *service, char **options)
inst->trx_target = config_get_integer(params, "group_trx");
inst->codec = config_get_enum(params, "codec", codec_values);
int first_file = config_get_integer(params, "start_index");
inst->block_size = config_get_integer(params, "block_size");
inst->block_size = config_get_size(params, "block_size");
MXS_CONFIG_PARAMETER *param = config_get_param(params, "source");
inst->gtid.domain = 0;

9
server/modules/routing/binlogrouter/blr_file.c
View File

@ -490,17 +490,20 @@ blr_file_add_magic(int fd)
* @return Non-zero if the fie creation succeeded
*/
static int
blr_file_create(ROUTER_INSTANCE *router, char *file)
blr_file_create(ROUTER_INSTANCE *router, char *orig_file)
{
if (strlen(file) > BINLOG_FNAMELEN)
if (strlen(orig_file) > BINLOG_FNAMELEN)
{
MXS_ERROR("The binlog filename %s is longer than "
"the maximum allowed length %d.",
file,
orig_file,
BINLOG_FNAMELEN);
return 0;
}
char file[strlen(orig_file) + 1];
strcpy(file, orig_file);
int created = 0;
char err_msg[MXS_STRERROR_BUFLEN];

3
server/modules/routing/debugcli/debugcmd.c
View File

@ -948,7 +948,8 @@ struct subcommand pingoptions[] =
"Ping Workers",
"Ping Workers",
{ARG_TYPE_NONE}
}
},
{EMPTY_OPTION}
};
/**