diff options
| author | unknown <monty@mysql.com> | 2004-06-10 11:59:45 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-10 11:59:45 +0300 |
| commit | 3e5eb498bcc47361928d20672ff6c76329860cef (patch) | |
| tree | 1899e10015ceea27466380baa0f763700a85cb5d /sql/item_cmpfunc.h | |
| parent | 4075c305154e11dc8bacae917ea0194119785dfb (diff) | |
| parent | 3665b3be90c2821dc95903cdf39df7a54e3c91a1 (diff) | |
| download | mariadb-git-3e5eb498bcc47361928d20672ff6c76329860cef.tar.gz | |
Merge with 3.23 to get latest bug fixes
mysql-test/t/type_date.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/type_date.result:
merge with 3.23
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 9f19e7575d5..a0bcd864d4b 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -583,7 +583,6 @@ public: Item_cond() : Item_bool_func(), abort_on_null(1) { const_item_cache=0; } Item_cond(Item *i1,Item *i2) :Item_bool_func(), abort_on_null(0) { list.push_back(i1); list.push_back(i2); } - ~Item_cond() { list.delete_elements(); } bool add(Item *item) { return list.push_back(item); } bool fix_fields(THD *,struct st_table_list *); |