summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-01-20 17:59:11 +0100
committerSergei Golubchik <serg@mariadb.org>2018-01-22 11:39:54 +0100
commit22ae3843db6c8b2a84ca5d16cd99025abb52cc27 (patch)
tree78cd7d2f09ac106939cdfdb81e5677ceb9135e22 /sql/sql_show.cc
parent204cb85aab3e6326e9f7a51c478efd6fad44801a (diff)
downloadmariadb-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 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 8789f0c9f24..06d5a6f570a 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2111,7 +2111,7 @@ public:
}
static void operator delete(void *ptr __attribute__((unused)),
size_t size __attribute__((unused)))
- { TRASH(ptr, size); }
+ { TRASH_FREE(ptr, size); }
ulong thread_id;
time_t start_time;