database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2002-11-04 15:45:54 +02:00
parent a4e64e252d 0bb1e716bc
commit 07573b03af
16 changed files with 569 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_base.cc
View File

@ -2448,10 +2448,10 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name,
DBUG_RETURN(result);
}
int setup_ftfuncs(THD *thd)
int setup_ftfuncs(SELECT_LEX *select_lex)
{
List_iterator<Item_func_match> li(*(thd->lex.select->ftfunc_list)),
lj(*(thd->lex.select->ftfunc_list));
List_iterator<Item_func_match> li(*(select_lex->ftfunc_list)),
lj(*(select_lex->ftfunc_list));
Item_func_match *ftf, *ftf2;
while ((ftf=li++))
@ -2470,11 +2470,11 @@ int setup_ftfuncs(THD *thd)
}
int init_ftfuncs(THD *thd, bool no_order)
int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order)
{
if (thd->lex.select->ftfunc_list->elements)
if (select_lex->ftfunc_list->elements)
{
List_iterator<Item_func_match> li(*(thd->lex.select->ftfunc_list));
List_iterator<Item_func_match> li(*(select_lex->ftfunc_list));
Item_func_match *ifm;
DBUG_PRINT("info",("Performing FULLTEXT search"));
thd->proc_info="FULLTEXT initialization";