diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
| commit | b006d2ead4640f0ab4e29687fd7d24988b1c98f1 (patch) | |
| tree | a478984bcd7f4bb2e0fd0496eae77b871077a380 /sql/opt_range.cc | |
| parent | b782971c58b5656820429b8ef3fae5fd82f5a0f7 (diff) | |
| parent | dc09f8f29cb2b9fdce7d5d5a623fdc8dcf1814f9 (diff) | |
| download | mariadb-git-b006d2ead4640f0ab4e29687fd7d24988b1c98f1.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index e783ee9bff4..77bf64f991a 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2075,7 +2075,7 @@ public: /* Table read plans are allocated on MEM_ROOT and are never deleted */ static void *operator new(size_t size, MEM_ROOT *mem_root) { return (void*) alloc_root(mem_root, (uint) size); } - static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); } + static void operator delete(void *ptr,size_t size) { TRASH_FREE(ptr, size); } static void operator delete(void *ptr, MEM_ROOT *mem_root) { /* Never called */ } virtual ~TABLE_READ_PLAN() {} /* Remove gcc warning */ |