diff options
| author | unknown <serg@serg.mysql.com> | 2001-02-10 20:54:58 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-02-10 20:54:58 +0100 |
| commit | 52ad800794c75c6225ac4d6cb9ee75a29ea33f27 (patch) | |
| tree | df5c6e3f9c2c0ee784a616e437f7dcc21565c933 | |
| parent | 61d3edba811967e0da3ae6ec3507fb6d723125ba (diff) | |
| download | mariadb-git-52ad800794c75c6225ac4d6cb9ee75a29ea33f27.tar.gz | |
sql_select.cc (at last) fulltext/cache bug fixed
fulltext_cache.result (at last) fulltext/cache bug fixed
mysql-test/r/fulltext_cache.result:
(at last) fulltext/cache bug fixed
sql/sql_select.cc:
(at last) fulltext/cache bug fixed
| -rw-r--r-- | mysql-test/r/fulltext_cache.result | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/fulltext_cache.result b/mysql-test/r/fulltext_cache.result index b2423816a86..a580437b0ce 100644 --- a/mysql-test/r/fulltext_cache.result +++ b/mysql-test/r/fulltext_cache.result @@ -8,7 +8,7 @@ ssde df s fsda sad er um chocolate Snickers 6 0 aaaaaaaaa dsaass de Bife 7 0 aaaaaaaaa dsaass de Pizza de Salmao 8 0 q item id x -aaaaaaaaa dsaass de sushi 1 0 +aaaaaaaaa dsaass de sushi 1 1.92378665219675 aaaaaaaaa dsaass de Bolo de Chocolate 2 0 aaaaaaaaa dsaass de Feijoada 3 0 aaaaaaaaa dsaass de Mousse de Chocolate 4 0 diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6ab286195de..ebdb6da8204 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -473,8 +473,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, (group && order) || test(select_options & OPTION_BUFFER_RESULT))); - make_join_readinfo(&join, - (select_options & SELECT_DESCRIBE) | SELECT_USE_CACHE); + make_join_readinfo(&join, (select_options & SELECT_DESCRIBE) | + (ftfuncs.elements ? 0 : SELECT_USE_CACHE)); // No cache for MATCH DBUG_EXECUTE("info",TEST_join(&join);); /* Because filesort always does a full table scan or a quick range scan |