diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-01 21:55:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-02 10:09:44 +0100 |
| commit | d4df7bc9b1fbdfb5c98134091a9ff998af60954f (patch) | |
| tree | dfd2f5128ccf94b6e86d2475aee23acf53fa868c /storage/federatedx | |
| parent | 80d3eee072025f34984e474ea160651eac9e11e5 (diff) | |
| parent | 96cb428b350ba48ee17ad9968d08f5318e48258c (diff) | |
| download | mariadb-git-d4df7bc9b1fbdfb5c98134091a9ff998af60954f.tar.gz | |
Merge branch 'github/10.0' into 10.1
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/ha_federatedx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h index abf25abe0c5..f3af7258623 100644 --- a/storage/federatedx/ha_federatedx.h +++ b/storage/federatedx/ha_federatedx.h @@ -169,7 +169,7 @@ public: 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); } + { TRASH_FREE(ptr, size); } virtual int query(const char *buffer, uint length)=0; virtual FEDERATEDX_IO_RESULT *store_result()=0; |