diff options
author | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-16 13:26:48 +0300 |
---|---|---|
committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-16 13:26:48 +0300 |
commit | 3808546d8a67d62420f9111998d94e44050ac313 (patch) | |
tree | 196e72d196b908a9b1a230f0e0095fa06571fc11 /sql/sql_union.cc | |
parent | 791f49f4e7de1b4c4b11b8b9a0207740b9adb59e (diff) | |
download | mariadb-git-3808546d8a67d62420f9111998d94e44050ac313.tar.gz |
Code cleanup
sql/item.cc:
As far as now transformer called after setup_wild() it is impossible to have '*' Item
sql/item.h:
As far as now transformer called after setup_wild() it is impossible to have '*' Item
sql/item_subselect.cc:
replaced Item_ref_on_list_position (which need erly ref_array initialisation)
sql/mysql_priv.h:
setup_ref_array moved to st_select_lex class
sql/sql_delete.cc:
setup_ref_array moved to st_select_lex class
sql/sql_derived.cc:
setup_ref_array moved to st_select_lex class
sql/sql_lex.cc:
removed double initialisation
select_n_having_items moved to any query initializations, because it used in setup_ref_array method
setup_ref_array moved to st_select_lex class
sql/sql_lex.h:
setup_ref_array moved to st_select_lex class
sql/sql_select.cc:
setup_ref_array moved to st_select_lex class
sql/sql_table.cc:
setup_ref_array moved to st_select_lex class
sql/sql_union.cc:
setup_ref_array moved to st_select_lex class
sql/sql_update.cc:
setup_ref_array moved to st_select_lex class
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 09d9c42ed95..3b5666f1ee2 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -156,11 +156,9 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, Item *item; 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_n_having_items + - select_cursor->order_list.elements + - select_cursor->group_list.elements)) || + if (select_cursor->setup_ref_array(thd, + select_cursor->order_list.elements + + select_cursor->group_list.elements) || setup_fields(thd, select_cursor->ref_pointer_array, first_table, item_list, 0, 0, 1)) goto err; |