database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Alexander Barkov
2018-02-04 18:40:06 +04:00
parent d6ed077fc8 28d4cf0c1b
commit 217fc122c8
69 changed files with 483 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/thr_malloc.cc
View File

@ -58,10 +58,11 @@ extern "C" {
}
}
void init_sql_alloc(MEM_ROOT *mem_root, uint block_size, uint pre_alloc,
myf my_flags)
void init_sql_alloc(MEM_ROOT *mem_root,
const char *area_name __attribute__((unused)),
uint block_size, uint pre_alloc, myf my_flags)
{
init_alloc_root(mem_root, block_size, pre_alloc, my_flags);
init_alloc_root(mem_root, area_name, block_size, pre_alloc, my_flags);
mem_root->error_handler=sql_alloc_error_handler;
}