database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-03 17:13:17 +03:00
Code Activity

Merge pull request #298 from mariadb-corporation/MCOL-985-1.1

Browse Source 
MCOL-985 Add return code test after call to buildReturnedColumn
This commit is contained in:
Andrew Hutchings
2017-10-25 14:28:20 +03:00
committed by GitHub
parent 751f9fbd2f b70e9b5f67
commit a6178b6adf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/mysql/ha_calpont_execplan.cpp
View File

@@ -3606,6 +3606,10 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
else else
{ {
rc = buildReturnedColumn(ord_col, gwi, gwi.fatalParseError); rc = buildReturnedColumn(ord_col, gwi, gwi.fatalParseError);
if (!rc || gwi.fatalParseError)
{
return NULL;
}
} }
// 10.2 TODO: direction is now a tri-state flag // 10.2 TODO: direction is now a tri-state flag
rc->asc((*order_item)->direction == ORDER::ORDER_ASC ? true : false); rc->asc((*order_item)->direction == ORDER::ORDER_ASC ? true : false);