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

Merge commit '262f1d7e471bacca6b985ec3f2cd5cb76d6e2584' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-10-26 12:44:57 +03:00
parent c45059f83d 262f1d7e47
commit 4d8a95d041
5 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/queryclassifier.cc
View File

@ -710,20 +710,36 @@ void QueryClassifier::check_create_tmp_table(GWBUF* querybuf, uint32_t type)
if (qc_query_is_type(type, QUERY_TYPE_CREATE_TMP_TABLE))
{
set_have_tmp_tables(true);
char* tblname = qc_get_created_table_name(querybuf);
int size = 0;
char** tblname = qc_get_table_names(querybuf, &size, true);
std::string table;
if (tblname && *tblname && strchr(tblname, '.') == NULL)
for (int i = 0; i < size; i++)
{
const char* db = qc_mysql_get_current_db(session());
table += db;
table += ".";
table += tblname;
if (tblname[i] && *tblname[i])
{
table = tblname[i];
if (strchr(tblname[i], '.') == NULL)
{
const char* db = qc_mysql_get_current_db(session());
table = db;
table += ".";
table += tblname[i];
}
break;
}
}
MXS_INFO("Added temporary table %s", table.c_str());
/** Add the table to the set of temporary tables */
add_tmp_table(table);
for (int i = 0; i < size; i++)
{
MXS_FREE(tblname[i]);
}
MXS_FREE(tblname);
}
}