database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Andrew Hutchings
2017-12-12 20:26:00 +00:00
parent b795e6b781 ca2c511f59
commit 59d0a45da3
8 changed files with 146 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/execplan/simplecolumn.cpp
View File

@ -117,7 +117,7 @@ ParseTree* replaceRefCol(ParseTree*& n, CalpontSelectExecutionPlan::ReturnedColu
{
SimpleColumn* sc = dynamic_cast<SimpleColumn*>(rc);
if (sc)
if (sc && (sc->colPosition() > -1))
{
ReturnedColumn* tmp = derivedColList[sc->colPosition()]->clone();
delete sc;