Commit 0a2cd4bb authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/bar/mysql-5.0
parents ff3495c4 8eb2b474

mysql-test/r/having.result

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ explain extended select count(a) as b from t1 where a=0 having b >=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 noticed after reading const tables

Warnings:

Note	1003	select count(`test`.`t1`.`a`) AS `b` from `test`.`t1` where (`test`.`t1`.`a` = 0) having (count(`test`.`t1`.`a`) >= 0)

Note	1003	select count(`test`.`t1`.`a`) AS `b` from `test`.`t1` where 0 having (count(`test`.`t1`.`a`) >= 0)

drop table t1;

CREATE TABLE t1 (

raw_id int(10) NOT NULL default '0',

mysql-test/r/select.result

+19 −0
Original line number Diff line number Diff line
@@ -3371,3 +3371,22 @@ NULL a NULL 
drop table t1,t2;

select * from (select * left join t on f1=f2) tt;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on f1=f2) tt' at line 1

CREATE TABLE t1 (sku int PRIMARY KEY, pr int);

CREATE TABLE t2 (sku int PRIMARY KEY, sppr int, name varchar(255));

INSERT INTO t1 VALUES

(10, 10), (20, 10), (30, 20), (40, 30), (50, 10), (60, 10);

INSERT INTO t2 VALUES 

(10, 10, 'aaa'), (20, 10, 'bbb'), (30, 10, 'ccc'), (40, 20, 'ddd'),

(50, 10, 'eee'), (60, 20, 'fff'), (70, 20, 'ggg'), (80, 30, 'hhh');

SELECT t2.sku, t2.sppr, t2.name, t1.sku, t1.pr

FROM t2, t1 WHERE t2.sku=20 AND (t2.sku=t1.sku OR t2.sppr=t1.sku);

sku	sppr	name	sku	pr

20	10	bbb	10	10

20	10	bbb	20	10

EXPLAIN

SELECT t2.sku, t2.sppr, t2.name, t1.sku, t1.pr

FROM t2, t1 WHERE t2.sku=20 AND (t2.sku=t1.sku OR t2.sppr=t1.sku);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	const	PRIMARY	PRIMARY	4	const	1	

1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	2	Using where

DROP TABLE t1,t2;

mysql-test/r/subselect.result

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	PRIMARY	t1	const	PRIMARY,numreponse	PRIMARY	7	const,const	1	Using index

2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

Warnings:

Note	1003	select `test`.`t1`.`numreponse` AS `numreponse` from `test`.`t1` where ((`test`.`t1`.`numreponse` = (select max(`test`.`t1`.`numreponse`) AS `MAX(numreponse)` from `test`.`t1` where (`test`.`t1`.`numeropost` = _latin1'1'))) and (`test`.`t1`.`numeropost` = _latin1'1'))

Note	1003	select `test`.`t1`.`numreponse` AS `numreponse` from `test`.`t1` where ((`test`.`t1`.`numeropost` = _latin1'1'))

drop table t1;

CREATE TABLE t1 (a int(1));

INSERT INTO t1 VALUES (1);

mysql-test/r/varbinary.result

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ explain extended select * from t1 where UNIQ=0x38afba1d73e6a18a; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	const	UNIQ	UNIQ	8	const	1	

Warnings:

Note	1003	select `test`.`t1`.`ID` AS `ID`,`test`.`t1`.`UNIQ` AS `UNIQ` from `test`.`t1` where (`test`.`t1`.`UNIQ` = 4084688022709641610)

Note	1003	select `test`.`t1`.`ID` AS `ID`,`test`.`t1`.`UNIQ` AS `UNIQ` from `test`.`t1` where 1

drop table t1;

select x'hello';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'x'hello'' at line 1

mysql-test/t/select.test

+23 −0
Original line number Diff line number Diff line
@@ -2848,3 +2848,26 @@ drop table t1,t2; 
#

--error 1064

select * from (select * left join t on f1=f2) tt;



#

# Bug #16504: re-evaluation of Item_equal object after reading const table

#



CREATE TABLE t1 (sku int PRIMARY KEY, pr int);

CREATE TABLE t2 (sku int PRIMARY KEY, sppr int, name varchar(255));



INSERT INTO t1 VALUES

  (10, 10), (20, 10), (30, 20), (40, 30), (50, 10), (60, 10);



INSERT INTO t2 VALUES 

  (10, 10, 'aaa'), (20, 10, 'bbb'), (30, 10, 'ccc'), (40, 20, 'ddd'),

  (50, 10, 'eee'), (60, 20, 'fff'), (70, 20, 'ggg'), (80, 30, 'hhh');



SELECT t2.sku, t2.sppr, t2.name, t1.sku, t1.pr

  FROM t2, t1 WHERE t2.sku=20 AND (t2.sku=t1.sku OR t2.sppr=t1.sku);

EXPLAIN

SELECT t2.sku, t2.sppr, t2.name, t1.sku, t1.pr

  FROM t2, t1 WHERE t2.sku=20 AND (t2.sku=t1.sku OR t2.sppr=t1.sku);





DROP TABLE t1,t2;