diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
| commit | 3cad31f2a758f797ef0acac5625d0e007ecbce93 (patch) | |
| tree | 73c054636c4858b2a51eddf7eaa653746d67524e /sql/sql_select.h | |
| parent | 560b9895d413bdfedda0a0ca871a635858990c05 (diff) | |
| parent | 5c057b3fef3aa92cfadbd63043799b430132a494 (diff) | |
| download | mariadb-git-3cad31f2a758f797ef0acac5625d0e007ecbce93.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 3f1fdac96cb..eb78f4216f9 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1976,7 +1976,7 @@ int report_error(TABLE *table, int error); int safe_index_read(JOIN_TAB *tab); int get_quick_record(SQL_SELECT *select); int setup_order(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables, - List<Item> &fields, List <Item> &all_fields, ORDER *order, + List<Item> &fields, List <Item> &all_fields, ORDER *order, bool from_window_spec= false); int setup_group(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables, List<Item> &fields, List<Item> &all_fields, ORDER *order, @@ -2057,7 +2057,7 @@ public: @param thd - Current thread. */ static void *operator new(size_t size, THD *thd) throw(); - static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); } + static void operator delete(void *ptr, size_t size) {TRASH_FREE(ptr, size);} Virtual_tmp_table(THD *thd) { |