From 48eda61cd41725498908308e0004897f10dd7307 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Sat, 18 Apr 2020 00:22:52 +0300
Subject: 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
---
 sql/field.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/field.cc')

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());
 
-- 
cgit v1.2.1