diff options
author | Igor Babaev <igor@askmonty.org> | 2013-10-14 12:30:20 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2013-10-14 12:30:20 -0700 |
commit | eae0a45f4e5ed4f1e382e53be74dd8082d4d797a (patch) | |
tree | 9d19ac9dc6a36ea9593abb199fd5d5c14f9d5b95 /mysql-test/r | |
parent | 4e243be509e7bf7f5cdc58555a86eed2d44c6872 (diff) | |
parent | 1381585244068f93cf640575bee4d8ea0e519d17 (diff) | |
download | mariadb-git-eae0a45f4e5ed4f1e382e53be74dd8082d4d797a.tar.gz |
Merge
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/subselect_sj2.result | 15 | ||||
-rw-r--r-- | mysql-test/r/subselect_sj2_jcl6.result | 15 | ||||
-rw-r--r-- | mysql-test/r/subselect_sj2_mat.result | 15 |
3 files changed, 45 insertions, 0 deletions
diff --git a/mysql-test/r/subselect_sj2.result b/mysql-test/r/subselect_sj2.result index 4f94f5a704c..d87514923c4 100644 --- a/mysql-test/r/subselect_sj2.result +++ b/mysql-test/r/subselect_sj2.result @@ -1094,6 +1094,21 @@ COUNT(*) 3724 set optimizer_prune_level=@tmp_951283; DROP TABLE t1,t2; +# +# Bug mdev-5135: crash on semijoin with nested outer joins +# +CREATE TABLE t1 (i1 int) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (i2 int, INDEX(i2)) ENGINE=MyISAM; +CREATE TABLE t3 (i3 int, c varchar(1), INDEX(i3), INDEX(c)) ENGINE=MyISAM; +INSERT INTO t3 VALUES (3,'x'),(4,'y'); +SELECT * FROM t1 WHERE ( 1, 1 ) IN ( +SELECT i2, i2 FROM t2 LEFT OUTER JOIN ( +t3 AS t3a INNER JOIN t3 AS t3b ON ( t3a.i3 = t3b.i3 ) +) ON ( t3a.c = t3b.c ) +); +i1 +DROP TABLE t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3,t4; # # MDEV-4782: Valgrind warnings (Conditional jump or move depends on uninitialised value) with InnoDB, semijoin diff --git a/mysql-test/r/subselect_sj2_jcl6.result b/mysql-test/r/subselect_sj2_jcl6.result index e0c5864f1b3..00e393635a2 100644 --- a/mysql-test/r/subselect_sj2_jcl6.result +++ b/mysql-test/r/subselect_sj2_jcl6.result @@ -1109,6 +1109,21 @@ COUNT(*) 3724 set optimizer_prune_level=@tmp_951283; DROP TABLE t1,t2; +# +# Bug mdev-5135: crash on semijoin with nested outer joins +# +CREATE TABLE t1 (i1 int) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (i2 int, INDEX(i2)) ENGINE=MyISAM; +CREATE TABLE t3 (i3 int, c varchar(1), INDEX(i3), INDEX(c)) ENGINE=MyISAM; +INSERT INTO t3 VALUES (3,'x'),(4,'y'); +SELECT * FROM t1 WHERE ( 1, 1 ) IN ( +SELECT i2, i2 FROM t2 LEFT OUTER JOIN ( +t3 AS t3a INNER JOIN t3 AS t3b ON ( t3a.i3 = t3b.i3 ) +) ON ( t3a.c = t3b.c ) +); +i1 +DROP TABLE t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3,t4; # # MDEV-4782: Valgrind warnings (Conditional jump or move depends on uninitialised value) with InnoDB, semijoin diff --git a/mysql-test/r/subselect_sj2_mat.result b/mysql-test/r/subselect_sj2_mat.result index 74fea8957a9..2306f19606c 100644 --- a/mysql-test/r/subselect_sj2_mat.result +++ b/mysql-test/r/subselect_sj2_mat.result @@ -1096,6 +1096,21 @@ COUNT(*) 3724 set optimizer_prune_level=@tmp_951283; DROP TABLE t1,t2; +# +# Bug mdev-5135: crash on semijoin with nested outer joins +# +CREATE TABLE t1 (i1 int) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (i2 int, INDEX(i2)) ENGINE=MyISAM; +CREATE TABLE t3 (i3 int, c varchar(1), INDEX(i3), INDEX(c)) ENGINE=MyISAM; +INSERT INTO t3 VALUES (3,'x'),(4,'y'); +SELECT * FROM t1 WHERE ( 1, 1 ) IN ( +SELECT i2, i2 FROM t2 LEFT OUTER JOIN ( +t3 AS t3a INNER JOIN t3 AS t3b ON ( t3a.i3 = t3b.i3 ) +) ON ( t3a.c = t3b.c ) +); +i1 +DROP TABLE t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3,t4; # # MDEV-4782: Valgrind warnings (Conditional jump or move depends on uninitialised value) with InnoDB, semijoin |