Skip to content

Commit 2232784

Browse files
committed
Fix inadverent change in Sql_alloc
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)
1 parent 17c9ed6 commit 2232784

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sql/sql_alloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Sql_alloc
3737
}
3838
static void *operator new[](size_t size, MEM_ROOT *mem_root) throw ()
3939
{ return alloc_root(mem_root, size); }
40-
static void *operator new(size_t size, MEM_ROOT *mem_root)
40+
static void *operator new(size_t size, MEM_ROOT *mem_root) throw()
4141
{ return alloc_root(mem_root, size); }
4242
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
4343
static void operator delete(void *, MEM_ROOT *){}

0 commit comments

Comments
 (0)