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

Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153

Browse Source 
into  adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153
This commit is contained in:
thek@adventure.(none)
2007-11-21 11:25:17 +01:00
parent 53b0324824 1794242b24
commit 7580f9043a
6 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_lex.h
View File

@ -1823,11 +1823,11 @@ typedef struct st_lex : public Query_tables_list
struct st_lex_local: public st_lex
{
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);
}