database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +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

2
sql/sql_string.h
View File

@ -149,7 +149,7 @@ public:
{
(void) ptr_arg;
(void) size;
TRASH(ptr_arg, size);
TRASH_FREE(ptr_arg, size);
}
static void operator delete(void *, MEM_ROOT *)
{ /* never called */ }