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

4
libmysqld/lib_sql.cc
View File

@ -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;
}