diff options
| author | bell@sanja.is.com.ua <> | 2003-05-26 15:52:19 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-05-26 15:52:19 +0300 |
| commit | 01217497b5c1e0ca46d3ebbf3920622fe9b81f22 (patch) | |
| tree | a8114cc133dc91fd75de0cb7b0c10aa5fd552fd1 /sql/sql_derived.cc | |
| parent | f537e3adc68997a1c9b9c09a6152536fa0f88908 (diff) | |
| parent | 3a30eda9218bce1fe955a8da33f9e0aff9437d9a (diff) | |
| download | mariadb-git-01217497b5c1e0ca46d3ebbf3920622fe9b81f22.tar.gz | |
merging
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 2bf1a68e504..c61e8f42343 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -126,7 +126,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, item_list= select_cursor->item_list; select_cursor->with_wild= 0; if (setup_ref_array(thd, &select_cursor->ref_pointer_array, - (item_list.elements + select_cursor->with_sum_func + + (item_list.elements + select_cursor->select_items + select_cursor->order_list.elements + select_cursor->group_list.elements)) || setup_fields(thd, select_cursor->ref_pointer_array, first_table, |