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

Move innodb dependent test to join_outer_innodb 


mysql-test/r/join_outer_innodb.result:
  New BitKeeper file ``mysql-test/r/join_outer_innodb.result''
mysql-test/t/join_outer_innodb.test:
  New BitKeeper file ``mysql-test/t/join_outer_innodb.test''
parent 38d09eb9

mysql-test/r/join_outer.result

+0 −19
Original line number Diff line number Diff line
@@ -1135,25 +1135,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	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

DROP TABLE t1,t2;

DROP VIEW IF EXISTS v1,v2;

DROP TABLE IF EXISTS t1,t2;

CREATE TABLE t1 (a int);

mysql-test/r/join_outer_innodb.result

0 → 100644
+19 −0
Original line number Diff line number Diff line 
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	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

DROP TABLE t1,t2;

mysql-test/t/join_outer.test

+2 −18
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
# test of left outer join

#



--source include/have_innodb.inc



--disable_warnings

drop table if exists t0,t1,t2,t3,t4,t5;

--enable_warnings
@@ -765,22 +763,8 @@ 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%';

# Test case moved to join_outer_innodb



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

mysql-test/t/join_outer_innodb.test

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#

# test of left outer join for tests that depends on innodb

#



--source include/have_innodb.inc



#

# 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;