Automerge.

mysql-test/collections/default.experimental

@@ -94,3 +94,6 @@ parts.partition_syntax_ndb               # joro : NDB tests marked as experiment
 parts.partition_value_ndb                # joro : NDB tests marked as experimental as agreed with bochklin
 main.mysqlhotcopy_myisam                 # horst: due to bug#54129
 main.mysqlhotcopy_archive                # horst: due to bug#54129
+main.gis-rtree                           # svoj: due to BUG#38965
+main.type_float                          # svoj: due to BUG#38965
+main.type_newdecimal                     # svoj: due to BUG#38965

mysql-test/r/gis.result

@@ -707,7 +707,7 @@ numgeometries(b) IS NULL, numinteriorrings(b) IS NULL, numpoints(b) IS NULL,
 area(b) IS NULL, glength(b) IS NULL, srid(b) IS NULL, x(b) IS NULL, 
 y(b) IS NULL
 from t1;
-ERROR 22007: Illegal non geometric '' value found during parsing
+ERROR 22007: Illegal non geometric '`test`.`t1`.`b`' value found during parsing
 select 
 within(b, b) IS NULL, contains(b, b) IS NULL, overlaps(b, b) IS NULL, 
 equals(b, b) IS NULL, disjoint(b, b) IS NULL, touches(b, b) IS NULL, 
@@ -722,7 +722,7 @@ point(b, b) IS NULL, linestring(b) IS NULL, polygon(b) IS NULL, multipoint(b) IS
 multilinestring(b) IS NULL, multipolygon(b) IS NULL, 
 geometrycollection(b) IS NULL
 from t1;
-ERROR 22007: Illegal non geometric '' value found during parsing
+ERROR 22007: Illegal non geometric '`test`.`t1`.`b`' value found during parsing
 drop table t1;
 CREATE TABLE t1(a POINT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (NULL);
@@ -1006,7 +1006,7 @@ drop table t1;
 SELECT MultiPoint(12345,'');
 ERROR 22007: Illegal non geometric '12345' value found during parsing
 SELECT 1 FROM (SELECT GREATEST(1,GEOMETRYCOLLECTION('00000','00000')) b FROM DUAL) AS d WHERE (LINESTRING(d.b));
-ERROR 22007: Illegal non geometric '' value found during parsing
+ERROR 22007: Illegal non geometric ''00000'' value found during parsing
 #
 # BUG#51875: crash when loading data into geometry function polyfromwkb
 #

sql/item_geofunc.h

@@ -181,13 +181,15 @@ class Item_func_spatial_collection: public Item_geometry_func
   String *val_str(String *);
   void fix_length_and_dec()
   {
-    for( unsigned int i=0; i<arg_count; ++i)
+    for (unsigned int i= 0; i < arg_count; ++i)
     {
-      if( args[i]->fixed && args[i]->field_type() != MYSQL_TYPE_GEOMETRY)
+      if (args[i]->fixed && args[i]->field_type() != MYSQL_TYPE_GEOMETRY)
       {
         String str;
-        args[i]->val_str(&str);
-        my_error(ER_ILLEGAL_VALUE_FOR_TYPE,MYF(0),"non geometric",str.c_ptr());
+        args[i]->print(&str, QT_ORDINARY);
+        str.append('\0');
+        my_error(ER_ILLEGAL_VALUE_FOR_TYPE, MYF(0), "non geometric",
+                 str.ptr());
       }
     }
   }