Commit 4c841236 authored by unknown's avatar unknown

Merge work:/home/bk/mysql-4.0

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


Docs/manual.texi:
  Auto merged
parents ba0f426e ecc6bdba
...@@ -48036,6 +48036,11 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}. ...@@ -48036,6 +48036,11 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet @itemize @bullet
@item @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. ODBC compatibility: added @code{BIT_LENGTH()} function.
@item @item
Fixed bug in @code{FLUSH QUERY CACHE}. Fixed bug in @code{FLUSH QUERY CACHE}.
...@@ -369,6 +369,8 @@ float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length) ...@@ -369,6 +369,8 @@ float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length)
if (docid == HA_POS_ERROR) if (docid == HA_POS_ERROR)
return -2.0; return -2.0;
if (!ftb->queue.elements)
return 0;
if (ftb->state == READY || ftb->state == INDEX_DONE) if (ftb->state == READY || ftb->state == INDEX_DONE)
{ {
for (i=1; i<=ftb->queue.elements; i++) for (i=1; i<=ftb->queue.elements; i++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment