database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge with 4.1

Browse Source
This commit is contained in:
monty@mysql.com
2005-02-15 17:12:13 +02:00
parent 410e51c854 44ceb84cdc
commit 38d1a42481
28 changed files with 231 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.h
View File

@ -73,7 +73,7 @@ public:
{ 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,size_t size, MEM_ROOT *mem_root)
static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
{ TRASH(ptr_arg, size); }
~String() { free(); }