diff options
| author | Monty <monty@mariadb.org> | 2020-04-18 00:22:52 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-04-18 11:51:42 +0300 |
| commit | 48eda61cd41725498908308e0004897f10dd7307 (patch) | |
| tree | 4e3bacc7c06af093b67f502077b60b052c27cc64 /sql/item.cc | |
| parent | a6d32976aee8e77caae66e1592011df248c7ffbb (diff) | |
| download | mariadb-git-48eda61cd41725498908308e0004897f10dd7307.tar.gz | |
Fixed memory leak with DEFAULT(f) on Geometry field
MDEV-21056 Assertion `global_status_var.global_memory_used == 0'
failed upon shutdown after query with DEFAULT on a geometry
field
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index ab7340a4689..141263f7bba 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8968,8 +8968,10 @@ bool Item_default_value::fix_fields(THD *thd, Item **items) } if (!(def_field= (Field*) thd->alloc(field_arg->field->size_of()))) goto error; + cached_field= def_field; memcpy((void *)def_field, (void *)field_arg->field, field_arg->field->size_of()); + def_field->reset_fields(); // If non-constant default value expression if (def_field->default_value && def_field->default_value->flags) { @@ -8997,6 +8999,12 @@ error: return TRUE; } +void Item_default_value::cleanup() +{ + delete cached_field; // Free cached blob data + cached_field= 0; + Item_field::cleanup(); +} void Item_default_value::print(String *str, enum_query_type query_type) { |