summaryrefslogtreecommitdiff
path: root/mysql-test/r/subselect_sj_nonmerged.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-06-04 19:56:06 -0700
committerIgor Babaev <igor@askmonty.org>2011-06-04 19:56:06 -0700
commitf03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch)
treeafb1235c5417019a563b1c1d64443f3b890d05df /mysql-test/r/subselect_sj_nonmerged.result
parentf0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff)
parent35c35858f859f23c23a414cdb21fdfe39d5de11c (diff)
downloadmariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
Diffstat (limited to 'mysql-test/r/subselect_sj_nonmerged.result')
-rw-r--r--mysql-test/r/subselect_sj_nonmerged.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/subselect_sj_nonmerged.result b/mysql-test/r/subselect_sj_nonmerged.result
index 9919ebfd939..2fb12ba258b 100644
--- a/mysql-test/r/subselect_sj_nonmerged.result
+++ b/mysql-test/r/subselect_sj_nonmerged.result
@@ -75,7 +75,7 @@ t4.b in (select max(t2.a) from t1, t2 group by t2.b);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 5 Using where
1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 5 Using where; Using join buffer (flat, BNL join)
-1 PRIMARY t4 ref a a 10 <subquery2>.max(t2.a),<subquery3>.max(t2.a) 12
+1 PRIMARY t4 ref a a 10 <subquery2>.max(t2.a),<subquery3>.max(t2.a) 11
3 SUBQUERY t2 ALL NULL NULL NULL NULL 5 Using temporary
3 SUBQUERY t1 ALL NULL NULL NULL NULL 10 Using join buffer (flat, BNL join)
2 SUBQUERY t2 ALL NULL NULL NULL NULL 5 Using temporary