Commit 4430048e authored by unknown's avatar unknown
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt


sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 456cc52e 08d9d182

mysql-test/r/gis.result

+11 −0
Original line number Diff line number Diff line
@@ -769,3 +769,14 @@ create table t1 (g geometry not null); 
insert into t1 values(default);

ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field

drop table t1;

CREATE TABLE t1 (a GEOMETRY);

CREATE VIEW v1 AS SELECT GeomFromwkb(ASBINARY(a)) FROM t1;

CREATE VIEW v2 AS SELECT a FROM t1;

DESCRIBE v1;

Field	Type	Null	Key	Default	Extra

GeomFromwkb(ASBINARY(a))	geometry	YES		NULL	

DESCRIBE v2;

Field	Type	Null	Key	Default	Extra

a	geometry	YES		NULL	

DROP VIEW v1,v2;

DROP TABLE t1;

mysql-test/r/range.result

+28 −0
Original line number Diff line number Diff line
@@ -717,6 +717,34 @@ d8c4177d225791924.30714720 
d8c4177d2380fc201.39666693

d8c4177d24ccef970.14957924

DROP TABLE t1;

create table t1 (

c1  char(10), c2  char(10), c3  char(10), c4  char(10),

c5  char(10), c6  char(10), c7  char(10), c8  char(10),

c9  char(10), c10 char(10), c11 char(10), c12 char(10),

c13 char(10), c14 char(10), c15 char(10), c16 char(10),

index(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,c13,c14,c15,c16)

);

insert into t1 (c1) values ('1'),('1'),('1'),('1');

select * from t1 where

c1 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c2 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c3 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c4 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c5 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c6 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c7 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c8 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c9 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c10 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c11 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c12 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c13 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c14 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c15 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c16 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

;

c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16

drop table t1;

End of 4.1 tests

CREATE TABLE t1 (

id int(11) NOT NULL auto_increment,

mysql-test/r/subselect.result

+23 −0
Original line number Diff line number Diff line
@@ -3924,3 +3924,26 @@ c a (SELECT GROUP_CONCAT(COUNT(a)+1) FROM t2 WHERE m = a) 
3	3	4

1	4	2,2

DROP table t1,t2;

CREATE TABLE t1 (a int, b int);

INSERT INTO t1 VALUES (2,22),(1,11),(2,22);

SELECT a FROM t1 WHERE (SELECT COUNT(b) FROM DUAL) > 0 GROUP BY a;

a

1

2

SELECT a FROM t1 WHERE (SELECT COUNT(b) FROM DUAL) > 1 GROUP BY a;

a

SELECT a FROM t1 t0

WHERE (SELECT COUNT(t0.b) FROM t1 t WHERE t.b>20) GROUP BY a;

a

1

2

SET @@sql_mode='ansi';

SELECT a FROM t1 WHERE (SELECT COUNT(b) FROM DUAL) > 0 GROUP BY a;

ERROR HY000: Invalid use of group function

SELECT a FROM t1 WHERE (SELECT COUNT(b) FROM DUAL) > 1 GROUP BY a;

ERROR HY000: Invalid use of group function

SELECT a FROM t1 t0

WHERE (SELECT COUNT(t0.b) FROM t1 t WHERE t.b>20) GROUP BY a;

ERROR HY000: Invalid use of group function

SET @@sql_mode=default;

DROP TABLE t1;

mysql-test/r/subselect3.result

+0 −6
Original line number Diff line number Diff line
@@ -661,12 +661,6 @@ SELECT * FROM t1 GROUP by t1.a 
HAVING (MAX(t1.b) > (SELECT MAX(t2.b) FROM t2 WHERE t2.c < t1.c

HAVING MAX(t2.b+t1.a) < 10));

a	b	c

SELECT a, AVG(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b))

AS test FROM t1 GROUP BY a;

a	AVG(b)	test

1	4.0000	NULL

2	2.0000	k

3	2.5000	NULL

SELECT a,b,c FROM t1 WHERE b in (9,3,4) ORDER BY b,c;

a	b	c

1	3	c

mysql-test/t/gis.test

+11 −0
Original line number Diff line number Diff line
@@ -479,3 +479,14 @@ create table t1 (g geometry not null); 
insert into t1 values(default);

drop table t1;



#

# Bug #27300: create view with geometry functions lost columns types 

#

CREATE TABLE t1 (a GEOMETRY);

CREATE VIEW v1 AS SELECT GeomFromwkb(ASBINARY(a)) FROM t1;

CREATE VIEW v2 AS SELECT a FROM t1;

DESCRIBE v1;

DESCRIBE v2;



DROP VIEW v1,v2;

DROP TABLE t1;