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/sql_show.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/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 98db2bb64e1..4fc0b65b774 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4891,7 +4891,8 @@ static int fill_schema_table_from_frm(THD *thd, TABLE *table, if (schema_table->i_s_requested_object & OPEN_TRIGGER_ONLY) { - init_sql_alloc(&tbl.mem_root, TABLE_ALLOC_BLOCK_SIZE, 0, MYF(0)); + init_sql_alloc(&tbl.mem_root, "fill_schema_table_from_frm", + TABLE_ALLOC_BLOCK_SIZE, 0, MYF(0)); if (!Table_triggers_list::check_n_load(thd, db_name, table_name, &tbl, 1)) { @@ -5174,8 +5175,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) goto err; /* Use tmp_mem_root to allocate data for opened tables */ - init_alloc_root(&tmp_mem_root, SHOW_ALLOC_BLOCK_SIZE, SHOW_ALLOC_BLOCK_SIZE, - MY_THREAD_SPECIFIC); + init_alloc_root(&tmp_mem_root, "get_all_tables", SHOW_ALLOC_BLOCK_SIZE, + SHOW_ALLOC_BLOCK_SIZE, MY_THREAD_SPECIFIC); for (size_t i=0; i < db_names.elements(); i++) { |