summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <svoj@april.(none)>2006-02-01 20:40:12 +0400
committerunknown <svoj@april.(none)>2006-02-01 20:40:12 +0400
commite3c3086304c6574a7b9d32e4acd339269a4f1749 (patch)
treeafae1d95f63cfb2e9e71573b6f7637dc81e94991 /sql
parentc98077d6101c7dc2b364e0536b1e675dc76d8f0f (diff)
downloadmariadb-git-e3c3086304c6574a7b9d32e4acd339269a4f1749.tar.gz
BUG#14496: Crash or strange results with prepared statement,
MATCH and FULLTEXT Fixed that fulltext query using PS results in unexpected behaviour when executed 2 or more times. mysql-test/r/fulltext.result: Testcase for BUG#14496. mysql-test/t/fulltext.test: Testcase for BUG#14496. sql/item_func.h: In Item_func_match::cleanup() always reset ft_handler to 0.
Diffstat (limited to 'sql')
-rw-r--r--sql/item_func.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 2c4976d1152..53d113c8b6f 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1056,7 +1056,6 @@ public:
if (!master && ft_handler)
{
ft_handler->please->close_search(ft_handler);
- ft_handler=0;
if (join_key)
table->file->ft_handler=0;
table->fulltext_searched=0;
@@ -1066,6 +1065,7 @@ public:
delete concat;
concat= 0;
}
+ ft_handler= 0;
DBUG_VOID_RETURN;
}
enum Functype functype() const { return FT_FUNC; }