Fix for #6553 and #8776 (no errors on bad spatial data)

1 files changed, 5 insertions, 2 deletions

diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 1a8cb50081b..b9f2ec8a6ca 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -55,8 +55,11 @@ String *Item_func_geometry_from_text::val_str(String *str)
     return 0;
   str->length(0);
   str->q_append(srid);
-  if ((null_value= !Geometry::create_from_wkt(&buffer, &trs, str, 0)))
-    return 0;
+  if (!Geometry::create_from_wkt(&buffer, &trs, str, 0))
+    /* We shouldn't return NULL here as NULL is a legal spatial object     */
+    /*  Geometry::bad_spatial_data will produce error message beeing stored*/
+    /*  in GEOMETRY field                                                  */
+    return &Geometry::bad_geometry_data;
   return str;
 }