Commit 379226c2 authored by unknown's avatar unknown
Browse files

merge fixes

parent 5222b590

mysql-test/r/create.result

+2 −0
Original line number Diff line number Diff line
@@ -780,6 +780,8 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295

drop table t1;

create table t1 (upgrade int);

drop table t1;

CREATE TABLE t1 (a int, b int);

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

CREATE TABLE t2 (primary key (a)) select * from t1;

mysql-test/r/func_group_innodb.result

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ min(7) 
NULL

select min(7) from DUAL;

min(7)

NULL

7

explain select min(7) from t2m join t1m;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
@@ -36,7 +36,7 @@ max(7) 
NULL

select max(7) from DUAL;

max(7)

NULL

7

explain select max(7) from t2m join t1m;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
@@ -75,7 +75,7 @@ min(7) 
NULL

select min(7) from DUAL;

min(7)

NULL

7

explain select min(7) from t2i join t1i;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1
@@ -91,7 +91,7 @@ max(7) 
NULL

select max(7) from DUAL;

max(7)

NULL

7

explain select max(7) from t2i join t1i;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1

mysql-test/r/func_str.result

+3 −3
Original line number Diff line number Diff line
@@ -1142,9 +1142,9 @@ A12 a12 
EXPLAIN EXTENDED 

SELECT * FROM t1 INNER JOIN t2 ON code=id 

WHERE id='a12' AND (LENGTH(code)=5 OR code < 'a00');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	code	code	13	const	3	Using where; Using index

1	SIMPLE	t2	ref	PRIMARY	PRIMARY	12	const	1	Using where; Using index

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	ref	code	code	13	const	3	100.00	Using where; Using index

1	SIMPLE	t2	ref	PRIMARY	PRIMARY	12	const	1	100.00	Using where; Using index

Warnings:

Note	1003	select `test`.`t1`.`code` AS `code`,`test`.`t2`.`id` AS `id` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`code` = _latin1'a12') and (`test`.`t2`.`id` = _latin1'a12') and (length(`test`.`t1`.`code`) = 5))

DROP TABLE t1,t2;

mysql-test/r/func_time.result

+2 −2
Original line number Diff line number Diff line
@@ -870,8 +870,8 @@ f1 
select f1 from t1 where cast("2006-1-1" as date) between f1 and cast('zzz' as date);

f1

Warnings:

Warning	1292	Truncated incorrect datetime value: 'zzz'

Warning	1292	Truncated incorrect datetime value: 'zzz'

Warning	1292	Incorrect datetime value: 'zzz'

Warning	1292	Incorrect datetime value: 'zzz'

select f1 from t1 where makedate(2006,1) between date(f1) and date(f3);

f1

2006-01-01

mysql-test/r/insert_update.result

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 
Warnings:

Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,values(`test`.`t1`.`a`) AS `VALUES(a)` from `test`.`t1`

explain extended select * from t1 where values(a);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where

Warnings:

Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where values(`test`.`t1`.`a`)

DROP TABLE t1;