removed ftfuncs argument for mysql_select

it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
re-disabled implicit ft initialization


sql/item_func.cc:
  re-disabled implicit initialization that was re-enabled (by me)
  for reasons unknown (at least the code passed all the tests)
sql/mysql_priv.h:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_base.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_parse.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_select.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function

1 files changed, 21 insertions, 4 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 624377b688e..70dc2ed058d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2199,17 +2199,18 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name,
   DBUG_RETURN(result);
 }
 
-int setup_ftfuncs(THD *thd,TABLE_LIST *tables, List<Item_func_match> &ftfuncs)
+int setup_ftfuncs(THD *thd)
 {
-  List_iterator<Item_func_match> li(ftfuncs), li2(ftfuncs);
+  List_iterator<Item_func_match> li(thd->lex.ftfunc_list),
+                                 lj(thd->lex.ftfunc_list);
   Item_func_match *ftf, *ftf2;
 
   while ((ftf=li++))
   {
     if (ftf->fix_index())
       return 1;
-    li2.rewind();
-    while ((ftf2=li2++) != ftf)
+    lj.rewind();
+    while ((ftf2=lj++) != ftf)
     {
       if (ftf->eq(ftf2) && !ftf2->master)
         ftf2->master=ftf;
@@ -2218,3 +2219,19 @@ int setup_ftfuncs(THD *thd,TABLE_LIST *tables, List<Item_func_match> &ftfuncs)
 
   return 0;
 }
+
+int init_ftfuncs(THD *thd, bool no_order)
+{
+  List_iterator<Item_func_match> li(thd->lex.ftfunc_list);
+  Item_func_match *ifm;
+  DBUG_PRINT("info",("Performing FULLTEXT search"));
+  thd->proc_info="FULLTEXT initialization";
+
+  while ((ifm=li++))
+  {
+    ifm->init_search(no_order);
+  }
+
+  return 0;
+}
+