diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-04-06 19:58:02 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-04-06 19:58:02 +0300 |
| commit | 0a34dc1e976b4901c708f21cb8d636c6f8371beb (patch) | |
| tree | ee510584b5a63629ae335c1d0acca9607bde1893 | |
| parent | 5b85d0a75b209bb0f9ce8a4a1aca962f40cda5be (diff) | |
| download | mariadb-git-0a34dc1e976b4901c708f21cb8d636c6f8371beb.tar.gz | |
Code cleanup after merge of 260dd47 into 10.2-window-functions
length is now calculated in Filesort::make_sortorder.
| -rw-r--r-- | sql/sql_select.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b51f9fbf119..7c2d2c53592 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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()) |