From 0f4e005541056fed489209f9503cc78e5b16c056 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Thu, 2 Nov 2017 15:40:27 +0200
Subject: Fixed compiler warning and warning from valgrind

The failing test was main.gis-json
---
 sql/item_geofunc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/item_geofunc.cc')

diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 1fa6b52cf96..6f79bd9a039 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -144,7 +144,7 @@ String *Item_func_geometry_from_json::val_str(String *str)
     {
       String *sv= args[1]->val_str(&tmp_js);
       my_error(ER_WRONG_VALUE_FOR_TYPE, MYF(0),
-               "option", sv->c_ptr(), "ST_GeometryFromJSON");
+               "option", sv->c_ptr_safe(), "ST_GeometryFromJSON");
       null_value= 1;
       return 0;
     }
-- 
cgit v1.2.1