Commit d87e4fbf authored by unknown's avatar unknown
Browse files

After merge fix

parent 55736ce5

mysql-test/r/gis.result

+10 −9
Original line number Diff line number Diff line
@@ -671,15 +671,6 @@ POINT(10 10) 
select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));

(asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))))

POINT(10 10)

create table t1 (g GEOMETRY);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

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

asbinary(g)

create table t1 (s1 geometry not null,s2 char(100));

create trigger t1_bu before update on t1 for each row set new.s1 = null;

insert into t1 values (null,null);
@@ -703,3 +694,13 @@ alter table t1 add primary key pti(pt); 
ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length

alter table t1 add primary key pti(pt(20));

drop table t1;

create table t1 (g GEOMETRY);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

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

asbinary(g)

drop table t1;

mysql-test/r/key.result

+2 −2
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ UNIQUE i1idx (i1), 
UNIQUE i2idx (i2));

desc t1;

Field	Type	Null	Key	Default	Extra

i1	int(11)		UNI	0	

i2	int(11)		UNI	0	

i1	int(11)	NO	UNI		

i2	int(11)	NO	UNI		

drop table t1;

create table t1 (

c1 int,

mysql-test/t/gis.test

+7 −5
Original line number Diff line number Diff line
@@ -377,11 +377,6 @@ select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440)))); 


# End of 4.1 tests



--enable_metadata

create table t1 (g GEOMETRY);

select * from t1;

select asbinary(g) from t1;

--disable_metadata

#

# Bug #12281 (Geometry: crash in trigger)

#
@@ -414,3 +409,10 @@ create table t1(pt GEOMETRY); 
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;