summaryrefslogtreecommitdiff
path: root/mysql-test/t/join_nested.test
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-10-27 16:31:22 -0700
committerIgor Babaev <igor@askmonty.org>2010-10-27 16:31:22 -0700
commit4f75a8254a3d65df031f4a3ea7ad44bb07917280 (patch)
tree40d6e05a135292981e2f3ce6246db2a7170c30cf /mysql-test/t/join_nested.test
parent851b2c3a025722101c7a0823dd03ff259196388c (diff)
parent0c53cd1ec9cbc50daf5b8d7c9f11e10f4d1fe564 (diff)
downloadmariadb-git-4f75a8254a3d65df031f4a3ea7ad44bb07917280.tar.gz
Merge 5.3-mwl128 -> 5.3
Diffstat (limited to 'mysql-test/t/join_nested.test')
-rw-r--r--mysql-test/t/join_nested.test5
1 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/t/join_nested.test b/mysql-test/t/join_nested.test
index 166aab99ccd..b4073b751a0 100644
--- a/mysql-test/t/join_nested.test
+++ b/mysql-test/t/join_nested.test
@@ -1196,9 +1196,6 @@ SELECT COUNT(*)
DROP TABLE t1,t2,t3,t4,t5;
-# !!!Remove the following if brackets after having merged the code of MWL#128
-if (`SELECT @@join_cache_level=1`)
-{
#
# BUG#49322: Nested left joins + not-exist optimization
#
@@ -1238,7 +1235,7 @@ SELECT t1.pk, t1.a, t2.pk, t2.a,t3.pk, t3.a
WHERE t3.pk IS NULL;
DROP TABLE t1, t2, t3;
-}
+
--echo End of 5.0 tests