diff options
| author | unknown <svoj@april.(none)> | 2006-02-07 15:30:32 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-02-07 15:30:32 +0400 |
| commit | 79f6936d738439d6e42da3ef89225fdaea318b54 (patch) | |
| tree | 8402a8f523d327a012699cec8afb0c2562b02d51 /sql/item_func.h | |
| parent | 96268d4a9a375fdd6e7effe530f26261bbd01d55 (diff) | |
| parent | a525b294704e7035ff6f8d3ef20f56fbbe251a98 (diff) | |
| download | mariadb-git-79f6936d738439d6e42da3ef89225fdaea318b54.tar.gz | |
Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
mysql-test/r/fulltext.result:
Manual merge.
mysql-test/t/fulltext.test:
Manual merge.
sql/item_func.h:
Manual merge.
sql/sql_base.cc:
Manual merge: use local.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index d81eb5f6ebf..d8fa45fb9c0 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1283,10 +1283,8 @@ public: DBUG_ENTER("Item_func_match"); Item_real_func::cleanup(); if (!master && ft_handler) - { ft_handler->please->close_search(ft_handler); - ft_handler=0; - } + ft_handler= 0; concat= 0; DBUG_VOID_RETURN; } |