diff options
| author | bell@sanja.is.com.ua <> | 2003-08-05 09:56:21 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-08-05 09:56:21 +0300 |
| commit | 659650b4eacb248309902211c6adbf74a7e3e30e (patch) | |
| tree | 66189752c7386d684a64116b60618ad0165a6a23 /sql/sql_union.cc | |
| parent | 62eaaf22f34131570be02eae098c3f5f355cf55d (diff) | |
| parent | 708ddc3a3bd10dead1c3e9cd42680fdbf7fa1a5b (diff) | |
| download | mariadb-git-659650b4eacb248309902211c6adbf74a7e3e30e.tar.gz | |
merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 0866163b3fd..cf338be16aa 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -159,7 +159,8 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, 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, |