summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-04-18 00:22:52 +0300
committerMonty <monty@mariadb.org>2020-04-18 11:51:42 +0300
commit48eda61cd41725498908308e0004897f10dd7307 (patch)
tree4e3bacc7c06af093b67f502077b60b052c27cc64 /sql/field.cc
parenta6d32976aee8e77caae66e1592011df248c7ffbb (diff)
downloadmariadb-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/field.cc')
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 857ba8d0e0c..f96755f5f51 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -8857,7 +8857,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
my_error(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, MYF(0),
Geometry::ci_collection[geom_type]->m_name.str,
- wkt.c_ptr(), db, tab_name, field_name,
+ wkt.c_ptr_safe(), db, tab_name, field_name,
(ulong) table->in_use->get_stmt_da()->
current_row_for_warning());