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-common | |
| 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-common')
| -rw-r--r-- | sql-common/client.c | 4 | ||||
| -rw-r--r-- | sql-common/client_plugin.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 163589a3978..b7a23e722f4 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -740,7 +740,7 @@ void free_old_query(MYSQL *mysql) if (mysql->fields) free_root(&mysql->field_alloc,MYF(0)); /* Assume rowlength < 8192 */ - init_alloc_root(&mysql->field_alloc, 8192, 0, + init_alloc_root(&mysql->field_alloc, "fields", 8192, 0, MYF(mysql->options.use_thread_specific_memory ? MY_THREAD_SPECIFIC : 0)); mysql->fields= 0; @@ -1464,7 +1464,7 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, DBUG_RETURN(0); } /* Assume rowlength < 8192 */ - init_alloc_root(&result->alloc, 8192, 0, + init_alloc_root(&result->alloc, "result", 8192, 0, MYF(mysql->options.use_thread_specific_memory ? MY_THREAD_SPECIFIC : 0)); result->alloc.min_malloc=sizeof(MYSQL_ROWS); diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c index f93e50125c5..f81660f8986 100644 --- a/sql-common/client_plugin.c +++ b/sql-common/client_plugin.c @@ -251,7 +251,7 @@ int mysql_client_plugin_init() bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ mysql_mutex_init(0, &LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); - init_alloc_root(&mem_root, 128, 128, MYF(0)); + init_alloc_root(&mem_root, "client_plugin", 128, 128, MYF(0)); bzero(&plugin_list, sizeof(plugin_list)); |