Merge mysql.com:/home/hf/work/22372/my41-22372

into  mysql.com:/home/hf/work/22372/my50-22372


mysql-test/r/gis.result:
  merging
mysql-test/t/gis.test:
  merging
sql/field.cc:
  merging
sql/field.h:
  merging
sql/sql_load.cc:
  merging

1 files changed, 14 insertions, 8 deletions

diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 7bba34be3ff..a9840c9b3b4 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -375,6 +375,20 @@ drop table t1;
 select (asWKT(geomfromwkb((0x000000000140240000000000004024000000000000))));
 select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));
 
+--enable_metadata
+create table t1 (g GEOMETRY);
+select * from t1;
+select asbinary(g) from t1;
+--disable_metadata
+drop table t1;
+
+create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
+alter table t1 disable keys;
+--error 1263
+load data infile '../../std_data/bad_gis_data.dat' into table t1;
+alter table t1 enable keys;
+drop table t1;
+
 # End of 4.1 tests
 
 #
@@ -410,15 +424,7 @@ alter table t1 add primary key pti(pt);
 alter table t1 add primary key pti(pt(20));
 drop table t1;
 
---enable_metadata
-create table t1 (g GEOMETRY);
-select * from t1;
-select asbinary(g) from t1;
---disable_metadata
-drop table t1;
-
 
 create table t1 select GeomFromText('point(1 1)');
 desc t1;
 drop table t1;
-