VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-15 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki 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

4
sql/sql_lex.h
View File

@ -417,11 +417,11 @@ public:
bool no_table_names_allowed; /* used for global order by */
bool no_error; /* suppress error message (convert it to warnings) */
static void *operator new(size_t size)
static void *operator new(size_t size) throw ()
{
return sql_alloc(size);
}
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,size_t size) { TRASH(ptr, size); }
static void operator delete(void *ptr, MEM_ROOT *mem_root) {}