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.0' into 1.0-merge-up

Browse Source
This commit is contained in:
Andrew Hutchings
2017-11-30 15:09:11 +00:00
parent 4d8026618c a3d81dd65e
commit 37f673d121
10 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/execplan/simplecolumn.cpp
View File

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