diff options
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f2e9309e589..f2b6956f213 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -19137,7 +19137,7 @@ int join_init_read_record(JOIN_TAB *tab) if (tab->distinct && tab->remove_duplicates()) // Remove duplicates. return 1; - if (tab->filesort && !tab->used_for_window_func && tab->sort_table()) // Sort table. + if (tab->filesort && tab->sort_table()) // Sort table. return 1; if (tab->select && tab->select->quick && (error= tab->select->quick->reset())) diff --git a/sql/sql_select.h b/sql/sql_select.h index d2780a795d0..e85931dcc7c 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -430,8 +430,6 @@ typedef struct st_join_table { */ Window_funcs_computation* window_funcs; - bool used_for_window_func; - /** List of topmost expressions in the select list. The *next* JOIN TAB in the plan should use it to obtain correct values. Same applicable to |