diff options
author | unknown <svoj@april.(none)> | 2006-02-07 13:49:55 +0400 |
---|---|---|
committer | unknown <svoj@april.(none)> | 2006-02-07 13:49:55 +0400 |
commit | 3a61484bea968fa0462117b906480a1953f1640c (patch) | |
tree | 12c71b4076ba6977e8abacc72ab9405d96a47b47 /sql/item_func.h | |
parent | 7ee57b157c954ee0b8cbdb75b923aa0b1ac7c30b (diff) | |
parent | ff587ac9e2ffcc5bcb2f4f65db8a042668ee8533 (diff) | |
download | mariadb-git-3a61484bea968fa0462117b906480a1953f1640c.tar.gz |
Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
sql/item_func.h:
Auto merged
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 53d113c8b6f..51f9d3fb36f 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1056,9 +1056,6 @@ public: if (!master && ft_handler) { ft_handler->please->close_search(ft_handler); - if (join_key) - table->file->ft_handler=0; - table->fulltext_searched=0; } if (concat) { |