diff --git a/Docs/manual.texi b/Docs/manual.texi
index ea70226b9b8..55f1759800a 100644
--- 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}.
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index 1b71337cc3b..c4e29bd636b 100644
--- 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++)