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

Merge branch '2.3.8' into 2.3

Browse Source
This commit is contained in:
Johan Wikman
2019-06-12 11:26:33 +03:00
parent 6ca5143141 814ae196e9
commit b98ff222f0
7 changed files with 81 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -1711,7 +1711,7 @@ public:
const Token* pDatabase = pName2->z ? pName1 : NULL;
char name[pName->n + 1];
strncpy(name, pName->z, pName->n);
memcpy(name, pName->z, pName->n);
name[pName->n] = 0;
QcAliases aliases;
@ -1719,7 +1719,7 @@ public:
if (pDatabase)
{
char database[pDatabase->n + 1];
strncpy(database, pDatabase->z, pDatabase->n);
memcpy(database, pDatabase->z, pDatabase->n);
database[pDatabase->n] = 0;
update_names(database, name, NULL, &aliases);
@ -1983,13 +1983,13 @@ public:
const Token* pDatabase = pName2->z ? pName1 : NULL;
char name[pName->n + 1];
strncpy(name, pName->z, pName->n);
memcpy(name, pName->z, pName->n);
name[pName->n] = 0;
if (pDatabase)
{
char database[pDatabase->n + 1];
strncpy(database, pDatabase->z, pDatabase->n);
memcpy(database, pDatabase->z, pDatabase->n);
database[pDatabase->n] = 0;
update_names(database, name, NULL, NULL);
@ -2186,14 +2186,14 @@ public:
if (pDatabase)
{
strncpy(database, pDatabase->z, pDatabase->n);
memcpy(database, pDatabase->z, pDatabase->n);
database[pDatabase->n] = 0;
zDatabase = database;
}
char table[pTable->n + 1];
strncpy(table, pTable->z, pTable->n);
memcpy(table, pTable->z, pTable->n);
table[pTable->n] = 0;
update_names(zDatabase, table, NULL, NULL);
@ -2294,14 +2294,14 @@ public:
if (pDatabase)
{
strncpy(database, pDatabase->z, pDatabase->n);
memcpy(database, pDatabase->z, pDatabase->n);
database[pDatabase->n] = 0;
zDatabase = database;
}
char table[pName->n + 1];
strncpy(table, pName->z, pName->n);
memcpy(table, pName->z, pName->n);
table[pName->n] = 0;
update_names(zDatabase, table, NULL, NULL);
@ -2424,7 +2424,7 @@ public:
m_type_mask = QUERY_TYPE_WRITE;
char zName[pName->n + 1];
strncpy(zName, pName->z, pName->n);
memcpy(zName, pName->z, pName->n);
zName[pName->n] = 0;
update_names("*any*", zName, NULL, NULL);
@ -3136,7 +3136,7 @@ public:
char database[pDatabase ? pDatabase->n + 1 : 0];
if (pDatabase)
{
strncpy(database, pDatabase->z, pDatabase->n);
memcpy(database, pDatabase->z, pDatabase->n);
database[pDatabase->n] = 0;
zDatabase = database;
}
@ -3146,7 +3146,7 @@ public:
}
char name[pName->n + 1];
strncpy(name, pName->z, pName->n);
memcpy(name, pName->z, pName->n);
name[pName->n] = 0;
update_names(zDatabase, name, NULL, NULL);
@ -3345,7 +3345,7 @@ private:
if (nDatabase)
{
strncpy(fullname, zDatabase, nDatabase);
memcpy(fullname, zDatabase, nDatabase);
fullname[nDatabase] = 0;
strcat(fullname, ".");
}