database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

Browse Source
This commit is contained in:
Davi Arnaut
2010-10-19 20:51:34 -02:00
parent 9be9ad7b05 1040f98ccf
commit 7af5094208
12 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_string.h
View File

@ -91,9 +91,13 @@ public:
}
static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
{ return (void*) alloc_root(mem_root, (uint) size); }
static void operator delete(void *ptr_arg,size_t size)
{ TRASH(ptr_arg, size); }
static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
static void operator delete(void *ptr_arg, size_t size)
{
(void) ptr_arg;
(void) size;
TRASH(ptr_arg, size);
}
static void operator delete(void *, MEM_ROOT *)
{ /* never called */ }
~String() { free(); }