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

Merge branch 'github/10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-02-01 21:55:30 +01:00
parent 80d3eee072 96cb428b35
commit d4df7bc9b1
448 changed files with 8900 additions and 3321 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 */