merging

mysql-test/r/gis.result

@@ -680,13 +680,13 @@ def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63
 g
 select asbinary(g) from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					asbinary(g)	252	8192	0	Y	128	0	63
+def					asbinary(g)	252	16777216	0	Y	128	0	63
 asbinary(g)
 drop table t1;
 create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
 alter table t1 disable keys;
 load data infile '../../std_data/bad_gis_data.dat' into table t1;
-ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 1
+ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'b' at row 1
 alter table t1 enable keys;
 drop table t1;
 create table t1 (s1 geometry not null,s2 char(100));