Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

689273af · serg@serg.mysql.com · 9ac867fd · 20cede8d · 689273af · 689273af
Commit 689273af authored Feb 23, 2001 by serg@serg.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

mysql-test/r/fulltext_cache.result mysql-test/r/fulltext_cache.result +1 -1

sql/sql_select.cc sql/sql_select.cc +2 -2

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
 mwagner@evoq.mwagner.org
 heikki@donna.mysql.fi
+serg@serg.mysql.com
--- 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

--- 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,
+  make_join_readinfo(&join, (select_options & SELECT_DESCRIBE) | 
-		     (select_options & SELECT_DESCRIBE) | SELECT_USE_CACHE);
+           (ftfuncs.elements ? 0 : SELECT_USE_CACHE)); // No cache for MATCH
  /* Need to tell Innobase that to play it safe, it should fetch all
     columns of the tables: this is because MySQL