diff options
| -rw-r--r-- | mysql-test/t/fulltext_cache.test | 7 | ||||
| -rw-r--r-- | sql/item_func.h | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mysql-test/t/fulltext_cache.test b/mysql-test/t/fulltext_cache.test index 314ecf8642f..c6c76ee9182 100644 --- a/mysql-test/t/fulltext_cache.test +++ b/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; + diff --git a/sql/item_func.h b/sql/item_func.h index bc196dc58a5..90400b4181a 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -849,9 +849,11 @@ public: 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"; } |