diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
| commit | 3bc1fcd409eb08474884a556fef193d707117212 (patch) | |
| tree | b838d2bae358ea54b828bff0e3dfb8a0faf1bc8e /sql/mysql_priv.h | |
| parent | e5fd013fdf6c8664daa0bbdcaf0d22bf44e90d62 (diff) | |
| parent | 5b82bc6644fb766c7a04b49d60e70c474450ce28 (diff) | |
| download | mariadb-git-3bc1fcd409eb08474884a556fef193d707117212.tar.gz | |
merge
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index b343beaa4e4..8dfc976071d 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -619,7 +619,8 @@ int mysql_multi_update(THD *thd, TABLE_LIST *table_list, List<Item> *fields, List<Item> *values, COND *conds, ulong options, enum enum_duplicates handle_duplicates, - SELECT_LEX_UNIT *unit, SELECT_LEX *select_lex); + SELECT_LEX_UNIT *unit, SELECT_LEX *select_lex, + bool converted); int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table, List<Item> &fields, List_item *values, List<Item> &update_fields, @@ -783,13 +784,15 @@ bool insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, const char *table_name, List_iterator<Item> *it, bool any_privileges, bool allocate_view_names); -bool setup_tables(THD *thd, TABLE_LIST *tables, Item **conds); +bool setup_tables(THD *thd, TABLE_LIST *tables, Item **conds, + TABLE_LIST **leaves, bool refresh_only); int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, List<Item> *sum_func_list, uint wild_num); int setup_fields(THD *thd, Item** ref_pointer_array, TABLE_LIST *tables, List<Item> &item, bool set_query_id, List<Item> *sum_func_list, bool allow_sum_func); -int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds); +int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves, + COND **conds); int setup_ftfuncs(SELECT_LEX* select); int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order); void wait_for_refresh(THD *thd); |