diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-04 18:40:06 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-04 18:40:06 +0400 |
| commit | 217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299 (patch) | |
| tree | 83093666c427b4770d82c0ff44f0d7034bec13a8 /sql/thr_malloc.cc | |
| parent | d6ed077fc82c2f4d20895db9a6b16ca295f23c33 (diff) | |
| parent | 28d4cf0c1b3366c6471866d144ef28fced1e5390 (diff) | |
| download | mariadb-git-217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/thr_malloc.cc')
| -rw-r--r-- | sql/thr_malloc.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc index 74763e81b15..e0385c33fd8 100644 --- a/sql/thr_malloc.cc +++ b/sql/thr_malloc.cc @@ -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; } |