diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-05 09:56:21 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-05 09:56:21 +0300 |
| commit | 6181294dab759a6f5197573f164ee061668b1d18 (patch) | |
| tree | 66189752c7386d684a64116b60618ad0165a6a23 /sql/sql_derived.cc | |
| parent | 29b230355da3eb1688f20ca8e802f7978692433a (diff) | |
| parent | 970f910d757f5a5a8ce0ff31a8d7321da71995e8 (diff) | |
| download | mariadb-git-6181294dab759a6f5197573f164ee061668b1d18.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_parse.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 92e37f95f0e..436d9412063 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -126,7 +126,8 @@ 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->select_items + + (item_list.elements + + select_cursor->select_n_having_items + select_cursor->order_list.elements + select_cursor->group_list.elements)) || setup_fields(thd, select_cursor->ref_pointer_array, first_table, |