database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Correct TRASH() macro usage

Browse Source 
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().
This commit is contained in:
Sergei Golubchik
2018-01-20 17:59:11 +01:00
parent 204cb85aab
commit 22ae3843db
17 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_lifo_buffer.h
View File

@ -84,7 +84,7 @@ public:
start= start_arg;
end= end_arg;
if (end != start)
TRASH(start, end - start);
TRASH_ALLOC(start, end - start);
reset();
}
@ -224,7 +224,7 @@ public:
{
DBUG_ASSERT(unused_end >= unused_start);
DBUG_ASSERT(end == unused_start);
TRASH(unused_start, unused_end - unused_start);
TRASH_ALLOC(unused_start, unused_end - unused_start);
end= unused_end;
}
/* Return pointer to start of the memory area that is occupied by the data */