Commit 463e9409 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1-opt 

into  mysql.com:/home/hf/work/8663/my51-8663


mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/item_func.cc:
  Auto merged
parents c8ac3b7c 13245571

Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ test-force: 
test-force-full:

	$(MAKE) force=--force test-full



#used by autopush.pl to run memory based tests

test-force-mem:

	$(MAKE) 'force=--force --mem' test



# Keep these for a while

test-pl:	test

test-full-pl:	test-full

include/my_time.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ typedef long my_time_t; 
#define TIME_NO_ZERO_DATE	(TIME_NO_ZERO_IN_DATE*2)

#define TIME_INVALID_DATES	(TIME_NO_ZERO_DATE*2)



my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,

                   ulong flags, int *was_cut);

enum enum_mysql_timestamp_type

str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,

                uint flags, int *was_cut);

mysql-test/r/func_group.result

+26 −0
Original line number Diff line number Diff line
@@ -1020,3 +1020,29 @@ t1 CREATE TABLE `t1` ( 
  `stddev(0)` double(8,4) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

CREATE TABLE t1 (a INT, b INT);

INSERT INTO t1 VALUES (1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8);

INSERT INTO t1 SELECT a, b+8       FROM t1;

INSERT INTO t1 SELECT a, b+16      FROM t1;

INSERT INTO t1 SELECT a, b+32      FROM t1;

INSERT INTO t1 SELECT a, b+64      FROM t1;

INSERT INTO t1 SELECT a, b+128     FROM t1;

INSERT INTO t1 SELECT a, b+256     FROM t1;

INSERT INTO t1 SELECT a, b+512     FROM t1;

INSERT INTO t1 SELECT a, b+1024    FROM t1;

INSERT INTO t1 SELECT a, b+2048    FROM t1;

INSERT INTO t1 SELECT a, b+4096    FROM t1;

INSERT INTO t1 SELECT a, b+8192    FROM t1;

INSERT INTO t1 SELECT a, b+16384   FROM t1;

INSERT INTO t1 SELECT a, b+32768   FROM t1;

SELECT a,COUNT(DISTINCT b) AS cnt FROM t1 GROUP BY a HAVING cnt > 50;

a	cnt

1	65536

SELECT a,SUM(DISTINCT b) AS sumation FROM t1 GROUP BY a HAVING sumation > 50;

a	sumation

1	2147516416

SELECT a,AVG(DISTINCT b) AS average FROM t1 GROUP BY a HAVING average > 50;

a	average

1	32768.5000

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/order_by.result

+27 −0
Original line number Diff line number Diff line
@@ -854,6 +854,33 @@ b a 
20	1

10	2

DROP TABLE t1;

CREATE TABLE t1 (a INT);

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

SELECT a + 1 AS num FROM t1 ORDER BY 30 - num;

num

3

2

SELECT CONCAT('test', a) AS str FROM t1 ORDER BY UPPER(str);

str

test1

test2

SELECT a + 1 AS num FROM t1 GROUP BY 30 - num;

num

3

2

SELECT a + 1 AS num FROM t1 HAVING 30 - num;

num

2

3

SELECT a + 1 AS num, num + 1 FROM t1;

ERROR 42S22: Unknown column 'num' in 'field list'

SELECT a + 1 AS num, (select num + 2 FROM t1 LIMIT 1) FROM t1;

num	(select num + 2 FROM t1 LIMIT 1)

2	4

3	5

SELECT a.a + 1 AS num FROM t1 a JOIN t1 b ON num = b.a;

ERROR 42S22: Unknown column 'num' in 'on clause'

DROP TABLE t1;

CREATE TABLE t1 (a int, b int, PRIMARY KEY  (a));

INSERT INTO t1 VALUES (1,1), (2,2), (3,3);

explain SELECT t1.b as a, t2.b as c FROM

mysql-test/r/subselect.result

+53 −5
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 
3	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	

Warnings:

Note	1003	select `test`.`t2`.`id` AS `id` from `test`.`t2` where <in_optimizer>(`test`.`t2`.`id`,<exists>(select 1 AS `1` having (<cache>(`test`.`t2`.`id`) = <ref_null_helper>(1)) union select 3 AS `3` having (<cache>(`test`.`t2`.`id`) = <ref_null_helper>(3))))

Note	1003	select `test`.`t2`.`id` AS `id` from `test`.`t2` where <in_optimizer>(`test`.`t2`.`id`,<exists>(select 1 AS `1` having trigcond((<cache>(`test`.`t2`.`id`) = <ref_null_helper>(1))) union select 3 AS `3` having trigcond((<cache>(`test`.`t2`.`id`) = <ref_null_helper>(3)))))

SELECT * FROM t2 WHERE id IN (SELECT 5 UNION SELECT 3);

id

SELECT * FROM t2 WHERE id IN (SELECT 5 UNION SELECT 2);
@@ -907,7 +907,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 
2	DEPENDENT SUBQUERY	t2	ref_or_null	a	a	5	func	2	100.00	Using where; Using index

2	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where

Warnings:

Note	1003	select `test`.`t1`.`a` AS `a`,<in_optimizer>(`test`.`t1`.`a`,<exists>(select 1 AS `Not_used` from `test`.`t2` join `test`.`t3` where ((`test`.`t3`.`a` = `test`.`t2`.`a`) and ((<cache>(`test`.`t1`.`a`) = `test`.`t2`.`a`) or isnull(`test`.`t2`.`a`))) having <is_not_null_test>(`test`.`t2`.`a`))) AS `t1.a in (select t2.a from t2,t3 where t3.a=t2.a)` from `test`.`t1`

Note	1003	select `test`.`t1`.`a` AS `a`,<in_optimizer>(`test`.`t1`.`a`,<exists>(select 1 AS `Not_used` from `test`.`t2` join `test`.`t3` where ((`test`.`t3`.`a` = `test`.`t2`.`a`) and trigcond(((<cache>(`test`.`t1`.`a`) = `test`.`t2`.`a`) or isnull(`test`.`t2`.`a`)))) having trigcond(<is_not_null_test>(`test`.`t2`.`a`)))) AS `t1.a in (select t2.a from t2,t3 where t3.a=t2.a)` from `test`.`t1`

drop table t1,t2,t3;

create table t1 (a float);

select 10.5 IN (SELECT * from t1 LIMIT 1);
@@ -2817,19 +2817,19 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 
1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	8	100.00	

2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	9	100.00	Using where

Warnings:

Note	1003	select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one` AS `one`,`test`.`t2`.`two` AS `two` from `test`.`t2` where ((`test`.`t2`.`flag` = _latin1'0') and ((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)) and ((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))) having (<is_not_null_test>(`test`.`t2`.`one`) and <is_not_null_test>(`test`.`t2`.`two`)))) AS `test` from `test`.`t1`

Note	1003	select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one` AS `one`,`test`.`t2`.`two` AS `two` from `test`.`t2` where ((`test`.`t2`.`flag` = _latin1'0') and trigcond((((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)) and ((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having trigcond((<is_not_null_test>(`test`.`t2`.`one`) and <is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1`

explain extended SELECT one,two from t1 where ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = 'N');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	8	100.00	Using where

2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	9	100.00	Using where

Warnings:

Note	1003	select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two` from `test`.`t1` where <in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one` AS `one`,`test`.`t2`.`two` AS `two` from `test`.`t2` where ((`test`.`t2`.`flag` = _latin1'N') and (<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) and (<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`))))

Note	1003	select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two` from `test`.`t1` where <in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one` AS `one`,`test`.`t2`.`two` AS `two` from `test`.`t2` where ((`test`.`t2`.`flag` = _latin1'N') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) and (<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`))))))

explain extended SELECT one,two,ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = '0' group by one,two) as 'test' from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	8	100.00	

2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	9	100.00	Using where; Using temporary; Using filesort

Warnings:

Note	1003	select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one` AS `one`,`test`.`t2`.`two` AS `two` from `test`.`t2` where (`test`.`t2`.`flag` = _latin1'0') group by `test`.`t2`.`one`,`test`.`t2`.`two` having (((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)) and ((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)) and <is_not_null_test>(`test`.`t2`.`one`) and <is_not_null_test>(`test`.`t2`.`two`)))) AS `test` from `test`.`t1`

Note	1003	select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one` AS `one`,`test`.`t2`.`two` AS `two` from `test`.`t2` where (`test`.`t2`.`flag` = _latin1'0') group by `test`.`t2`.`one`,`test`.`t2`.`two` having trigcond((((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)) and ((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)) and <is_not_null_test>(`test`.`t2`.`one`) and <is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1`

DROP TABLE t1,t2;

CREATE TABLE t1 (a char(5), b char(5));

INSERT INTO t1 VALUES (NULL,'aaa'), ('aaa','aaa');
@@ -3002,6 +3002,38 @@ field1 field2 
1	1

1	3

DROP TABLE t1, t2;

CREATE TABLE t1(a int, INDEX (a));

INSERT INTO t1 VALUES (1), (3), (5), (7);

INSERT INTO t1 VALUES (NULL);

CREATE TABLE t2(a int);

INSERT INTO t2 VALUES (1),(2),(3);

EXPLAIN SELECT a, a IN (SELECT a FROM t1) FROM t2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	

2	DEPENDENT SUBQUERY	t1	index_subquery	a	a	5	func	2	Using index

SELECT a, a IN (SELECT a FROM t1) FROM t2;

a	a IN (SELECT a FROM t1)

1	1

2	NULL

3	1

DROP TABLE t1,t2;

CREATE TABLE t1 (a DATETIME);

INSERT INTO t1 VALUES ('1998-09-23'), ('2003-03-25');

CREATE TABLE t2 AS SELECT 

(SELECT a FROM t1 WHERE a < '2000-01-01') AS sub_a 

FROM t1 WHERE a > '2000-01-01';

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `sub_a` datetime DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

CREATE TABLE t3 AS (SELECT a FROM t1 WHERE a < '2000-01-01') UNION (SELECT a FROM t1 WHERE a > '2000-01-01');

SHOW CREATE TABLE t3;

Table	Create Table

t3	CREATE TABLE `t3` (

  `a` datetime DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1,t2,t3;

create table t1 (df decimal(5,1));

insert into t1 values(1.1);

insert into t1 values(2.2);
@@ -3545,3 +3577,19 @@ FROM t1 GROUP BY t1.a LIMIT 1) 
2

2

DROP TABLE t1,t2;

CREATE TABLE t1 (a int, b int auto_increment, PRIMARY KEY (b));

CREATE TABLE t2 (x int auto_increment, y int, z int,

PRIMARY KEY (x), FOREIGN KEY (y) REFERENCES t1 (b));

SET SESSION sort_buffer_size = 32 * 1024;

SELECT SQL_NO_CACHE COUNT(*) 

FROM (SELECT  a, b, (SELECT x FROM t2 WHERE y=b ORDER BY z DESC LIMIT 1) c

FROM t1) t;

COUNT(*)

3000

SET SESSION sort_buffer_size = 8 * 1024 * 1024;

SELECT SQL_NO_CACHE COUNT(*) 

FROM (SELECT  a, b, (SELECT x FROM t2 WHERE y=b ORDER BY z DESC LIMIT 1) c

FROM t1) t;

COUNT(*)

3000

DROP TABLE t1,t2;