summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-12-10 23:23:34 -0800
committerIgor Babaev <igor@askmonty.org>2010-12-10 23:23:34 -0800
commit7f52af655a04c4fecfe32bede79bd65cac0e043d (patch)
tree071fe4a63bdce21ee8a0a6cfe5e7aa4b3b26f354 /mysql-test/suite/maria
parenteb70e64ceaa7aec6a35580643a3e5fc01b6a0630 (diff)
parent4e05898f539f299bbb12c49834502c1e471f2fc9 (diff)
downloadmariadb-git-7f52af655a04c4fecfe32bede79bd65cac0e043d.tar.gz
Merge.
Diffstat (limited to 'mysql-test/suite/maria')
-rw-r--r--mysql-test/suite/maria/r/maria.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result
index f6e3777a0b6..2463bba1db4 100644
--- a/mysql-test/suite/maria/r/maria.result
+++ b/mysql-test/suite/maria/r/maria.result
@@ -381,7 +381,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref a a 4 test.t2.a 3
explain select * from t1,t2 where t1.b=t2.b;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t2 ALL b NULL NULL NULL 2
+1 SIMPLE t2 ALL b NULL NULL NULL 2 Using where
1 SIMPLE t1 ref b b 5 test.t2.b 1
explain select * from t1,t2 force index(c) where t1.a=t2.a;
id select_type table type possible_keys key key_len ref rows Extra