diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 23:32:02 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:19:40 +0000 |
| commit | 8fe04a3df37d65254142c6d1297eda32c1013f7f (patch) | |
| tree | 46942e3ffc78ca7de8ae593d759993f83fd85c68 /sql/sql_show.cc | |
| parent | 282b652028ca79baa5a43aa5356d779a688947a8 (diff) | |
| download | mariadb-git-8fe04a3df37d65254142c6d1297eda32c1013f7f.tar.gz | |
Windows, compile : reenable previously disabled warning C4291
no matching operator delete found; memory will not be freed if initialization throws an exception
Added a no-op delete() for MEM_ROOT based placement-new()
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 2e06b912891..eb0c014f060 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2699,6 +2699,7 @@ public: static void operator delete(void *ptr __attribute__((unused)), size_t size __attribute__((unused))) { TRASH(ptr, size); } + static void operator delete(void *, MEM_ROOT *){} my_thread_id thread_id; uint32 os_thread_id; |