database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop' into develop-merge-up-20190729

Browse Source
This commit is contained in:
Andrew Hutchings
2019-08-09 14:01:11 +01:00
committed by GitHub
parent 83a8924229 a1d1bd7392
commit 7af9771319
23 changed files with 2612 additions and 2276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dbcon/mysql/ha_from_sub.cpp
View File

@ -322,9 +322,12 @@ ParseTree* setDerivedFilter(THD* thd, ParseTree*& n,
FromSubQuery::FromSubQuery(gp_walk_info& gwip) : SubQuery(gwip)
{}
FromSubQuery::FromSubQuery(gp_walk_info& gwip, SELECT_LEX* sub) :
SubQuery(gwip),
fFromSub(sub)
FromSubQuery::FromSubQuery(gp_walk_info& gwip,
SELECT_LEX* sub,
bool isPushdownHandler) :
SubQuery(gwip),
fFromSub(sub),
fPushdownHand(isPushdownHandler)
{}
FromSubQuery::~FromSubQuery()
@ -346,7 +349,7 @@ SCSEP FromSubQuery::transform()
csep->derivedTbAlias(fAlias); // always lower case
csep->derivedTbView(fGwip.viewName.alias);
if (getSelectPlan(gwi, *fFromSub, csep) != 0)
if (getSelectPlan(gwi, *fFromSub, csep, fPushdownHand) != 0)
{
fGwip.fatalParseError = true;