summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorunknown <svoj@april.(none)>2006-02-03 14:09:33 +0400
committerunknown <svoj@april.(none)>2006-02-03 14:09:33 +0400
commit394c88df3acd71730e004c84ca7ee64f4ed3fdec (patch)
tree4390a3084472a15a3bc3e48c7e12296dcd57be19 /sql/item_func.h
parent1e686ae7702d297cc9fd261c42864653f4fdd7b3 (diff)
downloadmariadb-git-394c88df3acd71730e004c84ca7ee64f4ed3fdec.tar.gz
BUG#16893: Crash in test 'fulltext_order_by'
Fixed that fulltext query + union results in unexpected behaviour. sql/item_func.h: Remove access to table object from cleanup() as the table object may have been dropped earlier (In case of temporary tables or of close_thread_tables() is run before cleanup()) This fixed a bug with access to already freed memory sql/sql_base.cc: Reset variables used by fulltext
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 2c4976d1152..5bf57a713c4 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1057,9 +1057,6 @@ public:
{
ft_handler->please->close_search(ft_handler);
ft_handler=0;
- if (join_key)
- table->file->ft_handler=0;
- table->fulltext_searched=0;
}
if (concat)
{