Commit 8776a1e1 authored by unknown's avatar unknown
Browse files

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

into  moonbone.local:/work/21475-bug-5.0-opt-mysql
parents 7a11df8c adb31669

mysql-test/r/innodb_mysql.result

+19 −0
Original line number Diff line number Diff line
@@ -318,3 +318,22 @@ explain select distinct f1, f2 from t1; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	PRIMARY	5	NULL	3	Using index for group-by; Using temporary

drop table t1;

CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),

INDEX (name)) ENGINE=InnoDB;

CREATE TABLE t2 (id int(11) NOT NULL PRIMARY KEY, fkey int(11),

FOREIGN KEY (fkey) REFERENCES t2(id)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1,'A1'),(2,'A2'),(3,'B');

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

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index

1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%' OR FALSE;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

mysql-test/r/join_outer.result

+0 −19
Original line number Diff line number Diff line
@@ -1137,25 +1137,6 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	ALL	PRIMARY	NULL	NULL	NULL	4	Using where

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.a	1	

DROP TABLE t1,t2;

CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),

INDEX (name)) ENGINE=InnoDB;

CREATE TABLE t2 (id int(11) NOT NULL PRIMARY KEY, fkey int(11),

FOREIGN KEY (fkey) REFERENCES t2(id)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1,'A1'),(2,'A2'),(3,'B');

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

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index

1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%' OR FALSE;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

DROP VIEW IF EXISTS v1,v2;

DROP TABLE IF EXISTS t1,t2;

CREATE TABLE t1 (a int);

mysql-test/t/innodb_mysql.test

+20 −0
Original line number Diff line number Diff line
@@ -282,3 +282,23 @@ explain select distinct f1 a, f1 b from t1; 
explain select distinct f1, f2 from t1;

drop table t1;



#

# Test for bug #17164: ORed FALSE blocked conversion of outer join into join

# 



CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),

                 INDEX (name)) ENGINE=InnoDB;

CREATE TABLE t2 (id int(11) NOT NULL PRIMARY KEY, fkey int(11),

                 FOREIGN KEY (fkey) REFERENCES t2(id)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1,'A1'),(2,'A2'),(3,'B');

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



EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

  WHERE t1.name LIKE 'A%';



EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

  WHERE t1.name LIKE 'A%' OR FALSE;



DROP TABLE t1,t2;

mysql-test/t/join_outer.test

+0 −21
Original line number Diff line number Diff line
@@ -759,27 +759,6 @@ EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a WHERE t1.a > IF(t1.a = t2.b 


DROP TABLE t1,t2;



#

# Test for bug #17164: ORed FALSE blocked conversion of outer join into join

# 



CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),

                 INDEX (name)) ENGINE=InnoDB;

CREATE TABLE t2 (id int(11) NOT NULL PRIMARY KEY, fkey int(11),

                 FOREIGN KEY (fkey) REFERENCES t2(id)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1,'A1'),(2,'A2'),(3,'B');

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



EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

  WHERE t1.name LIKE 'A%';



EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

  WHERE t1.name LIKE 'A%' OR FALSE;



DROP TABLE t1,t2;



#

# Bug 19396: LEFT OUTER JOIN over views in curly braces 

#

sql/mysql_priv.h

+9 −0
Original line number Diff line number Diff line
@@ -105,6 +105,15 @@ typedef struct my_locale_st 
  TYPELIB *ab_month_names;

  TYPELIB *day_names;

  TYPELIB *ab_day_names;

#ifdef __cplusplus 

  my_locale_st(const char *name_par, const char *descr_par, bool is_ascii_par,

               TYPELIB *month_names_par, TYPELIB *ab_month_names_par,

               TYPELIB *day_names_par, TYPELIB *ab_day_names_par) : 

    name(name_par), description(descr_par), is_ascii(is_ascii_par),

    month_names(month_names_par), ab_month_names(ab_month_names_par),

    day_names(day_names_par), ab_day_names(ab_day_names_par)

  {}

#endif

} MY_LOCALE;



extern MY_LOCALE my_locale_en_US;