diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-15 14:21:43 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-15 14:21:43 +0200 |
| commit | 8e1ab145b37453e9d95d9b984c39de5ec01cc82b (patch) | |
| tree | e682692cc2b300e73186e1cba7fa5ea1af7daa4a /sql/sql_base.cc | |
| parent | 1b7471a4313c852618fb10710923ef9b131cb4de (diff) | |
| parent | 53bd33c676a4b87e3170ea06f9ff75cdbff48507 (diff) | |
| download | mariadb-git-8e1ab145b37453e9d95d9b984c39de5ec01cc82b.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index d2d38d9a7c4..884e4b7eb27 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2180,8 +2180,8 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name, int setup_ftfuncs(THD *thd) { - List_iterator<Item_func_match> li(thd->lex.select_lex.ftfunc_list), - lj(thd->lex.select_lex.ftfunc_list); + List_iterator<Item_func_match> li(thd->lex.select->ftfunc_list), + lj(thd->lex.select->ftfunc_list); Item_func_match *ftf, *ftf2; while ((ftf=li++)) @@ -2201,9 +2201,9 @@ int setup_ftfuncs(THD *thd) int init_ftfuncs(THD *thd, bool no_order) { - if (thd->lex.select_lex.ftfunc_list.elements) + if (thd->lex.select->ftfunc_list.elements) { - List_iterator<Item_func_match> li(thd->lex.select_lex.ftfunc_list); + List_iterator<Item_func_match> li(thd->lex.select->ftfunc_list); Item_func_match *ifm; DBUG_PRINT("info",("Performing FULLTEXT search")); thd->proc_info="FULLTEXT initialization"; |