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 /libmysqld/lib_sql.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 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index a5f113b9bb2..4f78c97e723 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -655,7 +655,7 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag) thd->mysql= mysql; mysql->server_version= server_version; mysql->client_flag= client_flag; - init_alloc_root(&mysql->field_alloc, 8192, 0, MYF(0)); + init_alloc_root(&mysql->field_alloc, "fields", 8192, 0, MYF(0)); } /** @@ -971,7 +971,7 @@ int Protocol::begin_dataset() return 1; alloc= &data->alloc; /* Assume rowlength < 8192 */ - init_alloc_root(alloc, 8192, 0, MYF(0)); + init_alloc_root(alloc, "protocol", 8192, 0, MYF(0)); alloc->min_malloc= sizeof(MYSQL_ROWS); return 0; } |