summaryrefslogtreecommitdiff
path: root/mysql-test/r/select.result
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-02-24 20:07:12 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-02-24 20:07:12 +0400
commit2256ecdd7cfaccec4f081f48bb361e7e9a008263 (patch)
tree6812095b7c11a26f6cc101408241413a4b024fa5 /mysql-test/r/select.result
parentd206480605cdf70925ba10897ee5856d7c0920ec (diff)
parent0919edf32d29b9371288ce1a5f4e03f051bb8093 (diff)
downloadmariadb-git-2256ecdd7cfaccec4f081f48bb361e7e9a008263.tar.gz
Merge 5.2->5.3
Diffstat (limited to 'mysql-test/r/select.result')
-rw-r--r--mysql-test/r/select.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 9e06f2d3841..e25df1c7634 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -4821,10 +4821,10 @@ SET SESSION join_buffer_size = 2048;
EXPLAIN
SELECT STRAIGHT_JOIN * FROM t2, (t1 LEFT JOIN (t3,t4) ON t1.f1 = t4.f1), t5, t6;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 system NULL NULL NULL NULL 1
1 SIMPLE t2 ALL NULL NULL NULL NULL 12
+1 SIMPLE t1 ALL NULL NULL NULL NULL 1 Using join buffer (flat, BNL join)
1 SIMPLE t3 ALL NULL NULL NULL NULL 1 Using where
-1 SIMPLE t4 eq_ref PRIMARY PRIMARY 4 const 1
+1 SIMPLE t4 eq_ref PRIMARY PRIMARY 4 test.t1.f1 1
1 SIMPLE t5 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join)
1 SIMPLE t6 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join)
SELECT STRAIGHT_JOIN * FROM t2, (t1 LEFT JOIN (t3,t4) ON t1.f1 = t4.f1), t5, t6;