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

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2018-02-08 19:06:25 +04:00
parent 560b9895d4 5c057b3fef
commit 3cad31f2a7
522 changed files with 11092 additions and 4684 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 */ }