Skip to content

Commit

Permalink
Fix inadverent change in Sql_alloc
Browse files Browse the repository at this point in the history
For placement new, throw() exception specification was removed by
accident in 8fe04a3 , making  debug
tests, that simulate out-of-memory situations, fail (e.g filesort_debug)
  • Loading branch information
vaintroub committed Feb 10, 2018
1 parent 17c9ed6 commit 2232784
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sql/sql_alloc.h
Expand Up @@ -37,7 +37,7 @@ class Sql_alloc
}
static void *operator new[](size_t size, MEM_ROOT *mem_root) throw ()
{ 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); }
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
static void operator delete(void *, MEM_ROOT *){}
Expand Down

0 comments on commit 2232784

Please sign in to comment.