diff options
| author | Monty <monty@mariadb.org> | 2015-08-24 14:42:07 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-27 22:21:08 +0300 |
| commit | 3cb578c001b2feabd2410f281d20eb6566371453 (patch) | |
| tree | 4e3781e38f6531ea91ff127c024869c6b88c5849 /sql/sql_analyse.cc | |
| parent | ba340d8c47657774ba6d69bfc918dbebaaef6086 (diff) | |
| download | mariadb-git-3cb578c001b2feabd2410f281d20eb6566371453.tar.gz | |
MDEV-6152: Remove calls to current_thd while creating Item
- Part 3: Adding mem_root to push_back() and push_front()
Other things:
- Added THD as an argument to some partition functions.
- Added memory overflow checking for XML tag's in read_xml()
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index fe0834e4d47..1f801a33dcd 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -1188,7 +1188,7 @@ bool analyse::change_columns(THD *thd, List<Item> &field_list) output_str_length)); for (uint i = 0; i < array_elements(func_items); i++) - field_list.push_back(func_items[i]); + field_list.push_back(func_items[i], thd->mem_root); result_fields = field_list; return 0; } // analyse::change_columns |