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 with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-11-30 23:11:03 +02:00
parent b2e979d868 6f279f4014
commit 1e5061fe3b
524 changed files with 11683 additions and 5759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_string.h
View File

@ -95,9 +95,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(); }