diff options
| author | Daniel Black <danielgb@au.ibm.com> | 2018-02-04 22:20:52 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 22:20:52 +1100 |
| commit | a0a9958098604a57f2c53d1a1b0d50407a328da3 (patch) | |
| tree | 288f260c526778d13abd6ce4a0276104a8271883 /sql/sql_lifo_buffer.h | |
| parent | 67f3fb1bc54682a29ee3b407f60b798780db698f (diff) | |
| parent | aba15b864af664276261dcbbdaef35268d407af1 (diff) | |
| download | mariadb-git-a0a9958098604a57f2c53d1a1b0d50407a328da3.tar.gz | |
Merge branch '10.1' into 10.1-wsrep_sst_rsync_read_MYSQL_BASE_VERSION_config
Diffstat (limited to 'sql/sql_lifo_buffer.h')
| -rw-r--r-- | sql/sql_lifo_buffer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lifo_buffer.h b/sql/sql_lifo_buffer.h index 8fa13c66dd9..17024d15beb 100644 --- a/sql/sql_lifo_buffer.h +++ b/sql/sql_lifo_buffer.h @@ -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 */ |