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

Merge branch '2.0' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2016-12-22 13:40:16 +02:00
parent c7dfd1b0bd 68965639d2
commit 520d28b27d
13 changed files with 241 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/routing/schemarouter/sharding_common.c
View File

@ -34,16 +34,20 @@ bool extract_database(GWBUF* buf, char* str)
/** Copy database name from MySQL packet to session */
if (qc_get_operation(buf) == QUERY_OP_CHANGE_DB)
{
const char *delim = "` \n\t;";
query = modutil_get_SQL(buf);
tok = strtok_r(query, " ;", &saved);
tok = strtok_r(query, delim, &saved);
if (tok == NULL || strcasecmp(tok, "use") != 0)
{
MXS_ERROR("extract_database: Malformed change database packet.");
MXS_ERROR("extract_database: Malformed chage database packet.");
succp = false;
goto retblock;
}
tok = strtok_r(NULL, " ;", &saved);
tok = strtok_r(NULL, delim, &saved);
if (tok == NULL)
{
MXS_ERROR("extract_database: Malformed change database packet.");
@ -51,16 +55,7 @@ bool extract_database(GWBUF* buf, char* str)
goto retblock;
}
size_t len = strlen(tok);
if (len > MYSQL_DATABASE_MAXLEN)
{
MXS_ERROR("extract_database: Malformed change database packet, "
"too long database name.");
succp = false;
goto retblock;
}
strcpy(str, tok);
strncpy(str, tok, MYSQL_DATABASE_MAXLEN);
}
else
{