database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

removed ftfuncs argument for mysql_select

Browse Source 
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
re-disabled implicit ft initialization
This commit is contained in:
serg@serg.mysql.com
2001-11-21 18:05:11 +01:00
parent 47a75b04d4
commit f6cf7618be
5 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_base.cc
View File

@@ -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;
}