Commit 012ae635 authored by unknown's avatar unknown
Browse files

merging

parent 52ce1b73

mysql-test/r/explain.result

+10 −10
Original line number Diff line number Diff line
@@ -61,28 +61,28 @@ create table t1(f1 int, f2 int); 
insert into t1 values (1,1);

create view v1 as select * from t1 where f1=1;

explain extended select * from v1 where f2=1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	100.00	

Warnings:

Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where 1

explain extended select * from t1 where 0;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE

Warnings:

Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where 0

explain extended select * from t1 where 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	100.00	

Warnings:

Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where 1

explain extended select * from t1 having 0;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible HAVING

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible HAVING

Warnings:

Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` having 0

explain extended select * from t1 having 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	100.00	

Warnings:

Note	1003	select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` having 1

drop view v1;

mysql-test/r/func_in.result

+6 −0
Original line number Diff line number Diff line
@@ -444,8 +444,14 @@ SELECT HEX(a) FROM t2 WHERE a IN 
42);

HEX(a)

BB3C3E98175D33C8

7FFFFFFFFFFFFEFF

7FFFFFFFFFFFFFEF

7FFFFFFFFFFFFFFE

7FFFFFFFFFFFFFFF

8000000000000000

8000000000000001

8000000000000002

8000000000000300

8000000000000400

8000000000000401

SELECT HEX(a) FROM t2 WHERE a IN (0x7fffffffffffffff,0x8000000000000001);

mysql-test/r/sp.result

+13 −0
Original line number Diff line number Diff line
@@ -5832,4 +5832,17 @@ END| 
CALL bug24117()|

DROP PROCEDURE bug24117|

DROP TABLE t3|

DROP FUNCTION IF EXISTS bug25373|

CREATE FUNCTION bug25373(p1 INTEGER) RETURNS INTEGER

LANGUAGE SQL DETERMINISTIC

RETURN p1;|

CREATE TABLE t3 (f1 INT, f2 FLOAT)|

INSERT INTO t3 VALUES (1, 3.4), (1, 2), (1, 0.9), (2, 8), (2, 7)|

SELECT SUM(f2), bug25373(f1) FROM t3 GROUP BY bug25373(f1) WITH ROLLUP|

SUM(f2)	bug25373(f1)

6.3000000715256	1

15	2

21.300000071526	NULL

DROP FUNCTION bug25373|

DROP TABLE t3|

drop table t1,t2;