item_func.h bugfix

fulltext_cache.test	drop table added

Author: serg@serg.mysql.com

mysql-test/t/fulltext_cache.test

@@ -25,8 +25,11 @@ INSERT INTO t2 VALUES (6,2,'um chocolate Snickers');
 INSERT INTO t2 VALUES (7,1,'Bife');
 INSERT INTO t2 VALUES (8,1,'Pizza de Salmao');
 
-SELECT item, id, MATCH item AGAINST ('sushi') as x FROM t2 ORDER BY x DESC;
-
 SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi') as x FROM t1, t2
 WHERE (t2.id2 = t1.id) ORDER BY x DESC;
 
+SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi') as x FROM t2, t1
+WHERE (t2.id2 = t1.id) ORDER BY x DESC;
+
+drop table t1, t2;
+

sql/item_func.h

@@ -849,9 +849,11 @@ class Item_func_match :public Item_real_func
     if (!master)
     {
       if (ft_handler)
+      {
 	ft_close_search(ft_handler);
-      if(join_key)
-        table->file->ft_handler=0;
+        if(join_key)
+          table->file->ft_handler=0;
+      }
     }
   }
   const char *func_name() const { return "match"; }