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_delete.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_delete.cc')
-rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 876c4f9e670..a3be2d42d3b 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -126,8 +126,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, table->sort.io_cache = (IO_CACHE *) my_malloc(sizeof(IO_CACHE), MYF(MY_FAE | MY_ZEROFILL)); - if (setup_ref_array(thd, &thd->lex.select_lex.ref_pointer_array, - all_fields.elements)|| + if (thd->lex.select_lex.setup_ref_array(thd, 0) || setup_order(thd, thd->lex.select_lex.ref_pointer_array, &tables, fields, all_fields, order) || !(sortorder=make_unireg_sortorder(order, &length)) || |