diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-25 14:28:30 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-25 14:28:30 +0500 |
| commit | 7a310d32344d97b265bfffdc89897b6727e45b97 (patch) | |
| tree | 92ebe1a8c370f4ac63a8cf0804e3d98447a08cf3 /sql/item_cmpfunc.cc | |
| parent | 475a08a2f77092781539fc013255f0aab62ca5dd (diff) | |
| parent | 50563d39309ba82448a31f6a98e40181422f5147 (diff) | |
| download | mariadb-git-7a310d32344d97b265bfffdc89897b6727e45b97.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/27084/my51-27084
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_partition.h:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/partition.result:
merging
mysql-test/t/partition.test:
merging
sql/sql_partition.cc:
SCCS merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 543bc827c48..3477ce84b21 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2586,6 +2586,21 @@ void Item_func_case::print(String *str) str->append(STRING_WITH_LEN("end)")); } + +void Item_func_case::cleanup() +{ + uint i; + DBUG_ENTER("Item_func_case::cleanup"); + Item_func::cleanup(); + for (i= 0; i <= (uint)DECIMAL_RESULT; i++) + { + delete cmp_items[i]; + cmp_items[i]= 0; + } + DBUG_VOID_RETURN; +} + + /* Coalesce - return first not NULL argument. */ |