diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-10 00:07:39 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-10 00:07:39 +0000 |
| commit | 2232784f0094ae7e81f5033fe8f3499e15224fed (patch) | |
| tree | e2a2fa2c4e7837786f10680ba2ab6a1d3922d027 /sql/sql_alloc.h | |
| parent | 17c9ed672588b4b2c355efbab4329ff6b611dd78 (diff) | |
| download | mariadb-git-2232784f0094ae7e81f5033fe8f3499e15224fed.tar.gz | |
Fix inadverent change in Sql_alloc
For placement new, throw() exception specification was removed by
accident in 8fe04a3df37d65254142c6d1297eda32c1013f7f , making debug
tests, that simulate out-of-memory situations, fail (e.g filesort_debug)
Diffstat (limited to 'sql/sql_alloc.h')
| -rw-r--r-- | sql/sql_alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_alloc.h b/sql/sql_alloc.h index 9b596aa51a4..43f46160122 100644 --- a/sql/sql_alloc.h +++ b/sql/sql_alloc.h @@ -37,7 +37,7 @@ public: } 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 *){} |