diff options
author | unknown <serg@serg.mysql.com> | 2002-10-25 22:07:04 +0000 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2002-10-25 22:07:04 +0000 |
commit | 7962de4cf303e71600f7ff2beebcb5900ef41f71 (patch) | |
tree | a265b1027bdd9f187cbc41ed6c5c709d6793109e /myisam/ft_boolean_search.c | |
parent | d51b72cac30e5d02fde6e9c98c3e91716b19ed04 (diff) | |
parent | f5563ddad40e8ab84d457b0e9960ddfdc7faec99 (diff) | |
download | mariadb-git-7962de4cf303e71600f7ff2beebcb5900ef41f71.tar.gz |
merged
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
'Auto converge rename'
Docs/manual.texi:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_create.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'myisam/ft_boolean_search.c')
-rw-r--r-- | myisam/ft_boolean_search.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index fadffc0535e..2b9b6cedcf6 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -202,7 +202,8 @@ static void _ftb_init_index_search(FT_INFO *ftb) MI_KEYDEF *keyinfo; my_off_t keyroot; - if (ftb->state != READY || ftb->keynr == NO_SUCH_KEY) + if ((ftb->state != READY && ftb->state !=INDEX_DONE) || + ftb->keynr == NO_SUCH_KEY) return; ftb->state=INDEX_SEARCH; |