database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch 'bb-10.2-mdev9543' of github.com:MariaDB/server into bb-10.2-mdev9543

Browse Source
This commit is contained in:
Sergei Petrunia
2016-03-28 22:19:55 +03:00
parent 2bd4dc38e0 d146c2cedc
commit 4fe6fbbb63
8 changed files with 194 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_window.cc
View File

@ -1565,11 +1565,20 @@ bool Window_func_runner::exec(JOIN *join)
bool Window_funcs_computation::setup(THD *thd,
List<Item_window_func> *window_funcs)
List<Item_window_func> *window_funcs,
JOIN_TAB *tab)
{
List_iterator_fast<Item_window_func> it(*window_funcs);
Item_window_func *item_win;
Window_func_runner *runner;
SQL_SELECT *sel= NULL;
if (tab->filesort && tab->filesort->select)
{
sel= tab->filesort->select;
DBUG_ASSERT(!sel->quick);
}
// for each window function
while ((item_win= it++))
{
@ -1579,6 +1588,8 @@ bool Window_funcs_computation::setup(THD *thd,
{
return true;
}
/* Apply the same condition that the subsequent sort will */
runner->filesort->select= sel;
win_func_runners.push_back(runner, thd->mem_root);
}
return false;