Merge

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

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
 
   /* Need to tell Innobase that to play it safe, it should fetch all
      columns of the tables: this is because MySQL