database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix inadverent change in Sql_alloc

Browse Source 
For placement new, throw() exception specification was removed by
accident in 8fe04a3df3 , making  debug
tests, that simulate out-of-memory situations, fail (e.g filesort_debug)
This commit is contained in:
Vladislav Vaintroub
2018-02-10 00:07:39 +00:00
parent 17c9ed6725
commit 2232784f00
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_alloc.h
View File

@@ -37,7 +37,7 @@ public:
} }
static void *operator new[](size_t size, MEM_ROOT *mem_root) throw () static void *operator new[](size_t size, MEM_ROOT *mem_root) throw ()
{ return alloc_root(mem_root, size); } { return alloc_root(mem_root, 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 alloc_root(mem_root, size); } { return alloc_root(mem_root, size); }
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); } static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
static void operator delete(void *, MEM_ROOT *){} static void operator delete(void *, MEM_ROOT *){}