diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-05-26 15:52:19 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-05-26 15:52:19 +0300 |
| commit | 145aa40d59150159018676033e30ec227519f6ef (patch) | |
| tree | a8114cc133dc91fd75de0cb7b0c10aa5fd552fd1 /sql/sql_derived.cc | |
| parent | a6ebf38d72b9e3852e51314a87d636e2c6f8c37d (diff) | |
| parent | acda3d79b6f16441375171dfc58a78b85d313eff (diff) | |
| download | mariadb-git-145aa40d59150159018676033e30ec227519f6ef.tar.gz | |
merging
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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, |