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

Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam

Browse Source 
Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1
This commit is contained in:
Marc Alff
2008-08-11 16:44:13 -06:00
parent b0d5c8a10b 2f3b860305
commit 7f228cf20e
8 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.h
View File

@ -79,7 +79,7 @@ public:
Alloced_length=str.Alloced_length; alloced=0;
str_charset=str.str_charset;
}
static void *operator new(size_t size, MEM_ROOT *mem_root)
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); }