diff options
| author | Monty <monty@mariadb.org> | 2015-08-20 15:24:13 +0300 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-08-21 10:40:51 +0400 |
| commit | 1bae0d9e5669c2d03209082142e892417e24d09a (patch) | |
| tree | 8702469bab1f515c78a06ede07ae4aeaa297c802 /sql/sql_get_diagnostics.cc | |
| parent | 31e365efae28ba3208e80511c4d18fe11a79541a (diff) | |
| download | mariadb-git-1bae0d9e5669c2d03209082142e892417e24d09a.tar.gz | |
Stage 2 of MDEV-6152:
- Added mem_root to all calls to new Item
- Added private method operator new(size_t size) to Item to ensure that
we always use a mem_root when creating an item.
This saves use once call to current_thd per Item creation
Diffstat (limited to 'sql/sql_get_diagnostics.cc')
| -rw-r--r-- | sql/sql_get_diagnostics.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_get_diagnostics.cc b/sql/sql_get_diagnostics.cc index b6c215d29b1..1713cb04ebc 100644 --- a/sql/sql_get_diagnostics.cc +++ b/sql/sql_get_diagnostics.cc @@ -270,7 +270,7 @@ Condition_information_item::make_utf8_string_item(THD *thd, const String *str) String tmp(str->ptr(), str->length(), from_cs); /* If necessary, convert the string (ignoring errors), then copy it over. */ uint conv_errors; - return new Item_string(thd, &tmp, to_cs, &conv_errors, + return new (thd->mem_root) Item_string(thd, &tmp, to_cs, &conv_errors, DERIVATION_COERCIBLE, MY_REPERTOIRE_UNICODE30); } |