Fix for AsText() spatial function

1 files changed, 8 insertions, 4 deletions

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 4a7e5dfe33f..9c791453fd8 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2128,12 +2128,16 @@ String *Item_func_as_text::val_str(String *str)
 {
   String *wkt = args[0]->val_str(str);
   Geometry geom;
-  
-  str->length(0);
+
   if ((null_value=(args[0]->null_value ||
-                   geom.create_from_wkb(wkt->ptr(),wkt->length()) || 
-                   geom.as_wkt(str))))
+                   geom.create_from_wkb(wkt->ptr(),wkt->length())))) 
+    return 0;
+
+  str->length(0);
+
+  if ((null_value=geom.as_wkt(str)))
     return 0;
+
   return str;
 }