Commit 94069acc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/psergey/mysql-5.0-merge 

into  mysql.com:/home/psergey/mysql-5.1-merge


BitKeeper/deleted/.del-mysqld.cc.rej:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
mysql-test/r/subselect.result:
  Manual merge
mysql-test/t/subselect.test:
  Manual merge
sql/opt_range.cc:
  Manual merge
parents 689910ac bedd5b87

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

+22 −0
Original line number Diff line number Diff line
@@ -3924,6 +3924,28 @@ 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;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

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

mysql-test/t/range.test

+32 −0
Original line number Diff line number Diff line
@@ -568,6 +568,38 @@ SELECT s.oxid FROM t1 v, t1 s 


DROP TABLE t1;



# BUG#26624 high mem usage (crash) in range optimizer (depends on order of fields in where)

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



# This must run without crash and fast:

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

;

drop table t1;



--echo End of 4.1 tests



#

mysql-test/t/subselect.test

+25 −0
Original line number Diff line number Diff line
@@ -2784,6 +2784,31 @@ SELECT COUNT(*) c, a, 
DROP table t1,t2;



#

# Bug #27348: SET FUNCTION used in  a subquery from WHERE condition 

#  



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;

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



SELECT a FROM t1 t0

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



SET @@sql_mode='ansi';

--error 1111

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

--error 1111

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



--error 1111

SELECT a FROM t1 t0

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



SET @@sql_mode=default;

DROP TABLE t1;



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

#

CREATE TABLE t1 (s1 char(1));

sql/item_sum.cc

+5 −2
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ bool Item_sum::check_sum_func(THD *thd, Item **ref) 
    if (register_sum_func(thd, ref))

      return TRUE;

    invalid= aggr_level < 0 && !(allow_sum_func & (1 << nest_level));

    if (!invalid && thd->variables.sql_mode & MODE_ANSI)

      invalid= aggr_level < 0 && max_arg_level < nest_level;

  }

  if (!invalid && aggr_level < 0)

  {
@@ -165,6 +167,7 @@ bool Item_sum::check_sum_func(THD *thd, Item **ref) 
    are acceptable here: they are not, if the level of aggregation of

    some of them is less than aggr_level.

  */

  if (!invalid) 

    invalid= aggr_level <= max_sum_func_level;

  if (invalid)  

  {