database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch 'github/10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-02-06 14:50:50 +01:00
parent 60f51af755 0c25e58db6
commit 4771ae4b22
466 changed files with 9366 additions and 3618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.h
View File

@@ -185,7 +185,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 */ }