diff options
| author | monty@hundin.mysql.fi <> | 2001-11-22 14:40:38 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-22 14:40:38 +0200 |
| commit | 9265a4df45ea24b029ce024df7c9f34b7248a0d0 (patch) | |
| tree | ed7b5ac619c61e789b26d5243f8391f68a3fa04a /sql/mysql_priv.h | |
| parent | 9209210d30e5bd29f4df30f208f6e91cee3e089b (diff) | |
| parent | a2a838f88769dea90a0ba5a7196057eec6ca8c11 (diff) | |
| download | mariadb-git-9265a4df45ea24b029ce024df7c9f34b7248a0d0.tar.gz | |
merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index bd7c2f3cfd1..e0e85145c52 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -327,7 +327,6 @@ int setup_order(THD *thd,TABLE_LIST *tables, List<Item> &fields, int handle_select(THD *thd, LEX *lex, select_result *result); int mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &list,COND *conds, - List<Item_func_match> &ftfuncs, ORDER *order, ORDER *group,Item *having,ORDER *proc_param, ulong select_type,select_result *result); int mysql_union(THD *thd,LEX *lex,select_result *result); @@ -450,7 +449,8 @@ int setup_fields(THD *thd,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_ftfuncs(THD *thd,TABLE_LIST *tables, List<Item_func_match> &ftfuncs); +int setup_ftfuncs(THD *thd); +int init_ftfuncs(THD *thd, bool no_order); void wait_for_refresh(THD *thd); int open_tables(THD *thd,TABLE_LIST *tables); int open_and_lock_tables(THD *thd,TABLE_LIST *tables); |