5.5 merge

This commit is contained in:
Sergei Golubchik 2013-04-14 10:04:07 +02:00
commit f57ecb7786
56 changed files with 767 additions and 177 deletions

View file

@ -9343,7 +9343,6 @@ int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order)
List_iterator<Item_func_match> li(*(select_lex->ftfunc_list));
Item_func_match *ifm;
DBUG_PRINT("info",("Performing FULLTEXT search"));
thd_proc_info(thd, "FULLTEXT initialization");
while ((ifm=li++))
ifm->init_search(no_order);