Commit 6c7f692d authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
parents 168f72db acf8d0f4

mysql-test/r/group_by.result

+9 −0
Original line number Diff line number Diff line
@@ -764,3 +764,12 @@ select date(left(f1+0,8)) from t1 group by 1; 
date(left(f1+0,8))

2005-06-06

drop table t1;

create table t1(f1 varchar(5) key);

insert into t1 values (1),(2);

select sql_buffer_result max(f1) is null from t1;

max(f1) is null

0

select sql_buffer_result max(f1)+1 from t1;

max(f1)+1

3

drop table t1;

mysql-test/r/olap.result

+13 −0
Original line number Diff line number Diff line
@@ -516,3 +516,16 @@ a b c count 
1	NULL	NULL	2

NULL	NULL	NULL	2

DROP TABLE t1;

CREATE TABLE t1 (a int(11) NOT NULL);

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

SELECT * FROM (SELECT a, a + 1, COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;

a	a + 1	COUNT(*)

1	2	1

2	3	1

NULL	NULL	2

SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;

a	LENGTH(a)	COUNT(*)

1	1	1

2	1	1

NULL	NULL	2

DROP TABLE t1;

mysql-test/r/ps_1general.result

+6 −6
Original line number Diff line number Diff line
@@ -470,12 +470,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32928	0	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	14	N	1	31	8

def					Extra	253	255	14	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using filesort

SET @arg00=1 ;
@@ -486,12 +486,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	5	Y	0	31	8

def					possible_keys	252	4096	7	Y	0	31	8

def					possible_keys	253	4096	7	Y	0	31	8

def					key	253	64	7	Y	0	31	8

def					key_len	8	3	1	Y	32928	0	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	27	N	1	31	8

def					Extra	253	255	27	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	3	Using where; Using filesort

drop table if exists t2;

mysql-test/r/ps_2myisam.result

+3 −3
Original line number Diff line number Diff line
@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32928	0	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	0	N	1	31	8

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

drop table if exists t2 ;

mysql-test/r/ps_3innodb.result

+3 −3
Original line number Diff line number Diff line
@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63 
def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	Y	0	31	8

def					type	253	10	3	Y	0	31	8

def					possible_keys	252	4096	0	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32928	0	63

def					ref	252	1024	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	252	255	0	N	1	31	8

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2	

test_sequence