summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-06-22 15:17:40 +0300
committerunknown <bell@sanja.is.com.ua>2004-06-22 15:17:40 +0300
commitd82af3ae763340a7be60c1423d5aca3df8af1aa5 (patch)
tree69ab971bd511d6733b9c9d19db5875763a3472fd /sql/item_cmpfunc.cc
parent84afec5bfa6ae2a675667ed0399592bb1e2bbe86 (diff)
parent49aebb9891f075e0a5c53bdf76aba72fc6019e52 (diff)
downloadmariadb-git-d82af3ae763340a7be60c1423d5aca3df8af1aa5.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-regexp-4.1 sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index be509c7ed11..ab9c47ec727 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -2298,15 +2298,19 @@ longlong Item_func_regex::val_int()
}
-Item_func_regex::~Item_func_regex()
+void Item_func_regex::cleanup()
{
+ DBUG_ENTER("Item_func_regex::cleanup");
+ Item_bool_func::cleanup();
if (regex_compiled)
{
regfree(&preg);
regex_compiled=0;
}
+ DBUG_VOID_RETURN;
}
+
#endif /* USE_REGEX */