diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-01-20 17:59:11 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-22 11:39:54 +0100 |
commit | 22ae3843db6c8b2a84ca5d16cd99025abb52cc27 (patch) | |
tree | 78cd7d2f09ac106939cdfdb81e5677ceb9135e22 /storage | |
parent | 204cb85aab3e6326e9f7a51c478efd6fad44801a (diff) | |
download | mariadb-git-22ae3843db6c8b2a84ca5d16cd99025abb52cc27.tar.gz |
Correct TRASH() macro usage
TRASH was mapped to TRASH_FREE and was supposed to be used for memory
that should not be accessed anymore, while TRASH_ALLOC() is to be
used for uninitialized but to-be-used memory.
But sometimes TRASH() was used in the latter sense.
Remove TRASH() macro, always use explicit TRASH_ALLOC() or TRASH_FREE().
Diffstat (limited to 'storage')
-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 1c64892418e..9529cb126e7 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; |