diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-08-05 18:10:53 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-08-05 18:10:53 +0300 |
| commit | 529e1af2957828c4b8570933547b7202c8a36878 (patch) | |
| tree | 35b9b7d0d96ac96efa5d2dc6ab3a58ef497f1a6a /sql/sql_base.cc | |
| parent | 19c6bdba3bc57e68cdf72e8a4c23ded552fcd089 (diff) | |
| download | mariadb-git-529e1af2957828c4b8570933547b7202c8a36878.tar.gz | |
Fixed bug with GROUP BY on NULL fields.
(Merge of code from 4.0)
Docs/manual.texi:
Changelog
include/my_base.h:
Fixed bug with GROUP BY on NULL fields.
include/mysql_com.h:
Fixed bug with GROUP BY on NULL fields.
myisam/mi_search.c:
Fixed bug with GROUP BY on NULL fields.
myisam/mi_write.c:
Fixed bug with GROUP BY on NULL fields.
mysql-test/r/group_by.result:
Fixed bug with GROUP BY on NULL fields.
mysql-test/t/group_by.test:
Fixed bug with GROUP BY on NULL fields.
sql/sql_base.cc:
Removed some not-needed comments in the trace file
sql/sql_select.cc:
Fixed bug with GROUP BY on NULL fields.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index ee8c1097fb2..a40587bb8c9 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2222,18 +2222,18 @@ int setup_ftfuncs(THD *thd) 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++)) + if (thd->lex.ftfunc_list.elements) { - ifm->init_search(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; } - |