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-20180509-a2

Browse Source
This commit is contained in:
Andrew Hutchings
2018-05-09 09:20:55 +01:00
parent 24b8c790d5 3227421dea
commit 1a582eed4a
20 changed files with 3430 additions and 3306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dbcon/mysql/ha_window_function.cpp
View File

@ -512,12 +512,13 @@ ReturnedColumn* buildWindowFunctionColumn(Item* item, gp_walk_info& gwi, bool& n
{
Item* orderItem = *(orderCol->item);
srcp.reset(buildReturnedColumn(orderItem, gwi, nonSupport));
// MCOL-1052 GROUP BY handler has all of query's agg Items
// as field and correlates them with its extended SELECT Items.
// as field and correlates them with its extended SELECT Items.
if (!srcp)
{
orderItem = orderCol->item_ptr;
orderItem = orderCol->item_ptr;
if (orderItem)
{
gwi.fatalParseError = false;