Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
4b4bb4b9 · serg@serg.mysql.com · de949d8a · 15222943 · 4b4bb4b9 · 4b4bb4b9
Commit 4b4bb4b9 authored Jan 14, 2002 by serg@serg.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

Docs/manual.texi Docs/manual.texi +5 -0

myisam/ft_boolean_search.c myisam/ft_boolean_search.c +2 -0

No files found.
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -48036,6 +48036,11 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.

 @itemize @bullet
 @item
+Fixed bug with empty expression for boolean fulltext search.
+@item
+Fixed bug in updating fulltext key from/to @code{NULL}.
+No coredump anymore.
+@item
 ODBC compatibility: added @code{BIT_LENGTH()} function.
 @item
 Fixed bug in @code{FLUSH QUERY CACHE}.
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -369,6 +369,8 @@ float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length)

  if (docid == HA_POS_ERROR)
    return -2.0;
+  if (!ftb->queue.elements)
+    return 0;
  if (ftb->state == READY || ftb->state == INDEX_DONE)
  {
    for (i=1; i<=ftb->queue.elements; i++)