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

MXS-2850 Fix bug

Browse Source
This commit is contained in:
Johan Wikman
2020-01-28 11:08:27 +02:00
parent 36dee78cee
commit 399f312911
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -1247,6 +1247,11 @@ public:
IGNORE_COMPOUND_SELECTS IGNORE_COMPOUND_SELECTS
}; };
bool is_significant_union(const Select* pSelect)
{
return ((pSelect->op == TK_UNION) || (pSelect->op == TK_ALL)) && pSelect->pPrior;
}
void update_field_infos_from_select(QcAliases& aliases, void update_field_infos_from_select(QcAliases& aliases,
uint32_t context, uint32_t context,
const Select* pSelect, const Select* pSelect,
@ -1343,7 +1348,7 @@ public:
if (compound_approach == ANALYZE_COMPOUND_SELECTS) if (compound_approach == ANALYZE_COMPOUND_SELECTS)
{ {
if (((pSelect->op == TK_UNION) || (pSelect->op == TK_ALL)) && pSelect->pPrior) if (is_significant_union(pSelect))
{ {
const Select* pPrior = pSelect->pPrior; const Select* pPrior = pSelect->pPrior;
@ -2131,7 +2136,7 @@ public:
} }
QcAliases aliases; QcAliases aliases;
uint32_t context = (pSelect->op == TK_UNION && pSelect->pPrior) ? QC_FIELD_UNION : 0; uint32_t context = is_significant_union(pSelect) ? QC_FIELD_UNION : 0;
update_field_infos_from_select(aliases, context, pSelect, NULL); update_field_infos_from_select(aliases, context, pSelect, NULL);
} }