diff options
| author | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
| commit | afbe601302fc59c498437321b296ed6c8d360564 (patch) | |
| tree | 23bcc9a71fe7237887a111b158e30f5a6bb665d3 /sql/sql_list.h | |
| parent | 67456bb970cc949ceb5779b230592e455843c35c (diff) | |
| parent | 541883f9d89a8d38affba60bf9506289a6232da1 (diff) | |
| download | mariadb-git-afbe601302fc59c498437321b296ed6c8d360564.tar.gz | |
merge with 4.1
Diffstat (limited to 'sql/sql_list.h')
| -rw-r--r-- | sql/sql_list.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h index 40530314893..d8d3719d39d 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -41,6 +41,8 @@ public: 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) { TRASH(ptr, size); } + static void operator delete(void *ptr, size_t size, MEM_ROOT *mem_root) + { TRASH(ptr, size); } static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); } #ifdef HAVE_purify bool dummy; |