Commit 4333606d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
parents e54bbaa3 893055be

mysql-test/r/gis.result

+16 −10
Original line number Diff line number Diff line
@@ -673,6 +673,22 @@ 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	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_ln/bad_gis_data.dat' into table t1;

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));

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

insert into t1 values (null,null);
@@ -697,16 +713,6 @@ 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	16777216	0	Y	128	0	63

asbinary(g)

drop table t1;

create table t1 select GeomFromText('point(1 1)');

desc t1;

Field	Type	Null	Key	Default	Extra

mysql-test/r/subselect.result

+6 −0
Original line number Diff line number Diff line
@@ -3592,3 +3592,9 @@ FROM t1) t; 
COUNT(*)

3000

DROP TABLE t1,t2;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

s1

a

DROP TABLE t1;

mysql-test/std_data/bad_gis_data.dat

0 → 100644
+1 −0
Original line number Diff line number Diff line 
foo

mysql-test/t/gis.test

+14 −8
Original line number Diff line number Diff line
@@ -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_ln/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;

mysql-test/t/subselect.test

+8 −0
Original line number Diff line number Diff line
@@ -2496,3 +2496,11 @@ SELECT SQL_NO_CACHE COUNT(*) 
          FROM t1) t;



DROP TABLE t1,t2;



#

# Bug#20835 (literal string with =any values)

#

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

DROP TABLE t1;