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

Fix internal test suite failures

Browse Source 
The server test used the wrong name.

MySQL users test loaded multiple modules in one function call and wasn't
appropriate for an internal test suite test as it requires a working
installation.

The cache filter didn't set the library paths before trying to load
modules.

The binlogrouter was missing a NULL check which caused a crash.
This commit is contained in:
Markus Makela
2016-11-24 14:00:11 +02:00
parent 265aacaf15
commit dd63253261
5 changed files with 20 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
server/modules/routing/binlog/blr_slave.c
View File

@ -4585,35 +4585,28 @@ blr_handle_change_master_token(char *input, char *error, CHANGE_MASTER_OPTIONS *
static char *
blr_get_parsed_command_value(char *input)
{
/* space+TAB+= */
char *sep = " \t=";
char *ret = NULL;
char *word;
char *value = NULL;
if (strlen(input))
if (input && *input)
{
value = MXS_STRDUP_A(input);
}
else
{
return ret;
}
char value[strlen(input) + 1];
strcpy(value, input);
if ((word = get_next_token(NULL, sep, &input)) != NULL)
{
char *ptr;
/* space+TAB+= */
char *sep = " \t=";
char *word;
/* remove trailing spaces */
ptr = value + strlen(value) - 1;
while (ptr > value && isspace(*ptr))
if ((word = get_next_token(NULL, sep, &input)) != NULL)
{
*ptr-- = 0;
/* remove trailing spaces */
char *ptr = value + strlen(value) - 1;
while (ptr > value && isspace(*ptr))
{
*ptr-- = 0;
}
ret = MXS_STRDUP_A(strstr(value, word));
}
ret = MXS_STRDUP_A(strstr(value, word));
MXS_FREE(value);
}
return ret;