merging

mysql-test/r/gis-rtree.result

@@ -879,7 +879,7 @@ c1 varchar(15) collate utf8_bin default NULL,
 c3 varchar(10) collate utf8_bin default NULL,
 spatial_point point NOT NULL,
 PRIMARY KEY(id),
-SPATIAL KEY (spatial_point(32))
+SPATIAL KEY (spatial_point)
 )ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 INSERT INTO t1 (c2, c1, c3, spatial_point) VALUES
 ('y', 's', 'j', GeomFromText('POINT(167 74)')),

mysql-test/t/gis-rtree.test

@@ -251,7 +251,7 @@ CREATE TABLE t1 (id bigint(12) unsigned NOT NULL auto_increment,
   c3 varchar(10) collate utf8_bin default NULL,
   spatial_point point NOT NULL,
   PRIMARY KEY(id),
-  SPATIAL KEY (spatial_point(32))
+  SPATIAL KEY (spatial_point)
   )ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 #
 INSERT INTO t1 (c2, c1, c3, spatial_point) VALUES