diff options
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 eced813f75d..6a0ec13eac2 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -668,7 +668,8 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list, uint length, Item **ref, bool check_grants_table, bool check_grants_view, bool allow_rowid, - uint *cached_field_index_ptr); + uint *cached_field_index_ptr, + bool register_tree_change); Field * find_field_in_real_table(THD *thd, TABLE *table, const char *name, uint length, bool check_grants, bool allow_rowid, @@ -800,13 +801,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); bool 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); |