mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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''
This commit is contained in:
@ -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 t2 ALL PRIMARY NULL NULL NULL 4 Using where
|
||||||
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1
|
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.a 1
|
||||||
DROP TABLE t1,t2;
|
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 VIEW IF EXISTS v1,v2;
|
||||||
DROP TABLE IF EXISTS t1,t2;
|
DROP TABLE IF EXISTS t1,t2;
|
||||||
CREATE TABLE t1 (a int);
|
CREATE TABLE t1 (a int);
|
||||||
|
19
mysql-test/r/join_outer_innodb.result
Normal file
19
mysql-test/r/join_outer_innodb.result
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
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;
|
@ -2,8 +2,6 @@
|
|||||||
# test of left outer join
|
# test of left outer join
|
||||||
#
|
#
|
||||||
|
|
||||||
--source include/have_innodb.inc
|
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t0,t1,t2,t3,t4,t5;
|
drop table if exists t0,t1,t2,t3,t4,t5;
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
@ -763,24 +761,10 @@ DROP TABLE t1,t2;
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Test for bug #17164: ORed FALSE blocked conversion of outer join into join
|
# 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),
|
# Test case moved to join_outer_innodb
|
||||||
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
|
# Bug 19396: LEFT OUTER JOIN over views in curly braces
|
||||||
|
26
mysql-test/t/join_outer_innodb.test
Normal file
26
mysql-test/t/join_outer_innodb.test
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
#
|
||||||
|
# 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;
|
Reference in New Issue
Block a user