diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-09 15:49:11 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-09 15:49:11 +0200 |
| commit | 9450b41d57b0f723a907e29a9b7cb3a60cb430f2 (patch) | |
| tree | 09193b6adbb8f621c15ec79b5ff7d203c5df62cd /sql/item_func.h | |
| parent | 74b81a801785058706b46a1e75b67b026c468d04 (diff) | |
| parent | 8302f040b7314c0b6b4e28ead2394cdb4d0e8d5d (diff) | |
| download | mariadb-git-9450b41d57b0f723a907e29a9b7cb3a60cb430f2.tar.gz | |
merge
mysql-test/r/derived.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 30f817d133b..3d79a0eb9f3 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -999,6 +999,7 @@ public: join_key(0), ft_handler(0), table(0), master(0), concat(0) { } void cleanup() { + DBUG_ENTER("Item_func_match"); if (!master && ft_handler) { ft_handler->please->close_search(ft_handler); @@ -1009,6 +1010,7 @@ public: } if (concat) delete concat; + DBUG_VOID_RETURN; } enum Functype functype() const { return FT_FUNC; } const char *func_name() const { return "match"; } |