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

Merge branch 'develop' into firewall

Browse Source
This commit is contained in:
Markus Makela
2014-10-16 14:13:19 +03:00
parent 11c2d4dfe4 0633dc568c
commit 3ae29eb363
16 changed files with 267 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/config.c
View File

@ -817,7 +817,7 @@ int error_count = 0;
int found = 0;
while (obj1)
{
if (strcmp(s, obj1->object) == 0 &&
if (strcmp(trim(s), obj1->object) == 0 &&
obj->element && obj1->element)
{
found = 1;
@ -1449,7 +1449,7 @@ SERVER *server;
int found = 0;
while (obj1)
{
if (strcmp(s, obj1->object) == 0 &&
if (strcmp(trim(s), obj1->object) == 0 &&
obj->element && obj1->element)
{
found = 1;

4
server/core/hint.c
View File

@ -116,7 +116,7 @@ HINT *hint;
return head;
hint->next = head;
hint->type = HINT_PARAMETER;
hint->data = pname;
hint->data = strdup(pname);
hint->value = strdup(value);
return hint;
}
@ -151,4 +151,4 @@ bool hint_exists(
p_hint = &(*p_hint)->next;
}
return succp;
}
}

8
server/core/test/testadminusers.c
View File

@ -266,6 +266,14 @@ int
main(int argc, char **argv)
{
int result = 0;
char *home, buf[1024];
/* Unlink any existing password file before running this test */
if ((home = getenv("MAXSCALE_HOME")) == NULL)
home = "/usr/local/skysql";
sprintf(buf, "%s/etc/passwd", home);
if (strcmp(buf, "/etc/passwd") != 0)
unlink(buf);
result += test1();
result += test2();

2
server/core/test/testhint.c
View File

@ -49,7 +49,7 @@ HINT *hint;
hint = hint_create_parameter(NULL, strdup("name"), "value");
ss_info_dassert(NULL != hint, "New hint list should not be null");
ss_info_dassert(0 == strcmp("value", hint->value), "Hint value should be correct");
ss_info_dassert(0 != hint_exists(hint, HINT_PARAMETER), "Hint of parameter type should exist");
ss_info_dassert(0 != hint_exists(&hint, HINT_PARAMETER), "Hint of parameter type should exist");
ss_dfprintf(stderr, "\t..done\nFree hints.");
if (NULL != hint) hint_free(hint);
ss_dfprintf(stderr, "\t..done\n");

6
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -1708,6 +1708,12 @@ static int routeQuery(
}
goto retblock;
}
/** If buffer is not contiguous, make it such */
if (querybuf->next != NULL)
{
querybuf = gwbuf_make_contiguous(querybuf);
}
master_dcb = router_cli_ses->rses_master_ref->bref_dcb;
CHK_DCB(master_dcb);

6
server/modules/routing/readwritesplit/test/rwsplit.sh
View File

@ -18,7 +18,7 @@ echo ""
exit 1
fi
if [ "$#" == "$NARGS" ]
if [ "$#" = "$NARGS" ]
then
echo "CTest mode"
TDIR=$7 #this is only used by CMake
@ -267,7 +267,7 @@ do
break
fi
done
if [[ "$err" == "" ]]
if [[ "$err" = "" ]]
then
echo "TEST PASSED" >> $TLOG
else
@ -293,7 +293,7 @@ do
break
fi
done
if [[ "$err" == "" ]]
if [[ "$err" = "" ]]
then
echo "TEST PASSED" >> $TLOG
else