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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Johan Wikman
2020-08-19 16:37:52 +03:00
parent f3d4c27e58 bf6ff8a578
commit 02b0a4c52c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -1423,16 +1423,19 @@ public:
void update_names_from_srclist(QcAliases* pAliases, void update_names_from_srclist(QcAliases* pAliases,
const SrcList* pSrc) const SrcList* pSrc)
{ {
for (int i = 0; i < pSrc->nSrc; ++i) if (pSrc) // TODO: Figure out in what contexts pSrc can be NULL.
{ {
if (pSrc->a[i].zName) for (int i = 0; i < pSrc->nSrc; ++i)
{ {
update_names(pSrc->a[i].zDatabase, pSrc->a[i].zName, pSrc->a[i].zAlias, pAliases); if (pSrc->a[i].zName)
} {
update_names(pSrc->a[i].zDatabase, pSrc->a[i].zName, pSrc->a[i].zAlias, pAliases);
}
if (pSrc->a[i].pSelect && pSrc->a[i].pSelect->pSrc) if (pSrc->a[i].pSelect && pSrc->a[i].pSelect->pSrc)
{ {
update_names_from_srclist(pAliases, pSrc->a[i].pSelect->pSrc); update_names_from_srclist(pAliases, pSrc->a[i].pSelect->pSrc);
}
} }
} }
} }