diff options
| author | unknown <igor@rurik.mysql.com> | 2004-02-19 01:09:54 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-02-19 01:09:54 -0800 |
| commit | f4353d48ccc39527540daf709a1167462b39738c (patch) | |
| tree | aa627335f475f099e0d352b39af4e24d6e1ac189 /sql/item_row.h | |
| parent | c88e5213d4f8acbbba33d293a9573042818f0aec (diff) | |
| parent | 9ce4695da0bfe74e840dcf708da10cac9740e137 (diff) | |
| download | mariadb-git-f4353d48ccc39527540daf709a1167462b39738c.tar.gz | |
Manual merge
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_row.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/item_row.h')
| -rw-r--r-- | sql/item_row.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index a550bce4b5a..ec5f0f1fc95 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -34,12 +34,6 @@ public: with_null(0) {} - ~Item_row() - { - if (array_holder && items) - sql_element_free(items); - } - enum Type type() const { return ROW_ITEM; }; void illegal_method_call(const char *); bool is_null() { return null_value; } |