mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code cleanup after merge of 260dd47 into 10.2-window-functions

Browse source 
length is now calculated in Filesort::make_sortorder.
This commit is contained in:
Sergei Petrunia 2016-04-06 19:58:02 +03:00
parent 5b85d0a75b
commit 0a34dc1e97
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_select.cc
View file

@ -21207,7 +21207,6 @@ use_filesort:
int
create_sort_index(THD *thd, JOIN *join, JOIN_TAB *tab, Filesort *fsort)
{
uint length;
TABLE *table;
SQL_SELECT *select;
bool quick_created= FALSE;
@ -21225,14 +21224,6 @@ create_sort_index(THD *thd, JOIN *join, JOIN_TAB *tab, Filesort *fsort)
/* Currently ORDER BY ... LIMIT is not supported in subqueries. */
DBUG_ASSERT(join->group_list || !join->is_in_subquery());
/*
Calculate length of join->order as this may be longer than 'order',
which may come from 'group by'. This is needed as join->sortorder is
used both for grouping and ordering.
*/
length= 0;
table->status=0; // May be wrong if quick_select
if (!tab->preread_init_done && tab->preread_init())