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 /sql/table.cc | |
| 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 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 9cade76cb78..6795621b719 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -3991,7 +3991,7 @@ void TABLE::init(THD *thd, TABLE_LIST *tl) DBUG_ASSERT(key_read == 0); /* mark the record[0] uninitialized */ - TRASH(record[0], s->reclength); + TRASH_ALLOC(record[0], s->reclength); /* Initialize the null marker bits, to ensure that if we are doing a read |