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 /storage/federatedx | |
| 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 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/ha_federatedx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h index f5affebc426..8ae5d8bbc8e 100644 --- a/storage/federatedx/ha_federatedx.h +++ b/storage/federatedx/ha_federatedx.h @@ -170,6 +170,8 @@ public: { 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 *) + { } virtual int query(const char *buffer, size_t length)=0; virtual FEDERATEDX_IO_RESULT *store_result()=0; |