summaryrefslogtreecommitdiff
path: root/mysql-test/r/join.result
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2011-03-30 10:10:59 +0300
committerunknown <timour@askmonty.org>2011-03-30 10:10:59 +0300
commit952556b3452d4a6893a678da88809b22e7f7a466 (patch)
tree938de6db815840eb2038bdded942ab684e4673d0 /mysql-test/r/join.result
parent9762b236d47e74f2f065c89a747c1a8d3444ed18 (diff)
parent0737fb479f082c424881e79e4c358670176ebca2 (diff)
downloadmariadb-git-952556b3452d4a6893a678da88809b22e7f7a466.tar.gz
MWL#89
Merge 5.3 with 5.3-mwl89.
Diffstat (limited to 'mysql-test/r/join.result')
-rw-r--r--mysql-test/r/join.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index 935e3ee3b62..e3ef617503f 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -1314,7 +1314,7 @@ WHERE t1.f1 IN (SELECT f1 FROM t1) AND t1.f1 = t2.f1 OR t1.f1 = 9;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 ALL PRIMARY NULL NULL NULL 2 Using where
1 PRIMARY t2 ALL PRIMARY NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join)
-2 SUBQUERY t1 index NULL PRIMARY 4 NULL 2 Using index
+2 DEPENDENT SUBQUERY t1 unique_subquery PRIMARY PRIMARY 4 func 1 Using index
SELECT STRAIGHT_JOIN * FROM t1 JOIN t2 ON t2.f2 = t1.f1
WHERE t1.f1 IN (SELECT f1 FROM t1) AND t1.f1 = t2.f1 OR t1.f1 = 9;
f1 f2 f1 f2