diff options
| author | monty@mysql.com <> | 2004-10-22 19:51:04 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-22 19:51:04 +0300 |
| commit | a30898125764a78ac6b4484bb1f89926aace81ae (patch) | |
| tree | 1fb78469661db531e60badbca2a8312043ee404d /sql/item.h | |
| parent | 2dfc05b14753f61845b675f28ad4bba08e484a94 (diff) | |
| parent | e5f30a8375ad1d9bc1ad60047fa61da40b9a3a19 (diff) | |
| download | mariadb-git-a30898125764a78ac6b4484bb1f89926aace81ae.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 116dc86390c..e22cef7ba7f 100644 --- a/sql/item.h +++ b/sql/item.h @@ -97,7 +97,8 @@ public: static void *operator new(size_t size) {return (void*) sql_alloc((uint) size); } static void *operator new(size_t size, MEM_ROOT *mem_root) { return (void*) alloc_root(mem_root, (uint) size); } - static void operator delete(void *ptr,size_t size) {} /*lint -e715 */ + static void operator delete(void *ptr,size_t size) {} + static void operator delete(void *ptr,size_t size, MEM_ROOT *mem_root) {} enum Type {FIELD_ITEM, FUNC_ITEM, SUM_FUNC_ITEM, STRING_ITEM, INT_ITEM, REAL_ITEM, NULL_ITEM, VARBIN_ITEM, |