Merge branch 'github/10.1' into 10.2

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 60796df35d4..31be891553e 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2499,7 +2499,7 @@ public:
   { return alloc_root(mem_root, size); }
   static void operator delete(void *ptr __attribute__((unused)),
                               size_t size __attribute__((unused)))
-  { TRASH(ptr, size); }
+  { TRASH_FREE(ptr, size); }
 
   my_thread_id thread_id;
   uint32 os_thread_id;