summaryrefslogtreecommitdiff
path: root/mysql-test/r/distinct.result
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-02-11 15:00:29 -0800
committerunknown <igor@rurik.mysql.com>2005-02-11 15:00:29 -0800
commit6cb5736b9be935f1ce6f83f60cf6e1ebfd9987bf (patch)
tree5fd0acdfc20a0e3997eb5e2dcfb65dc8620197b9 /mysql-test/r/distinct.result
parentc1c79f6b993661ed140278ccabe8053353449a7d (diff)
parentcf78ff694732aa3e11a8bd82c25df64664fff18a (diff)
downloadmariadb-git-6cb5736b9be935f1ce6f83f60cf6e1ebfd9987bf.tar.gz
Manual merge
Diffstat (limited to 'mysql-test/r/distinct.result')
-rw-r--r--mysql-test/r/distinct.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
index 80af2dd0983..f4bc4263c4d 100644
--- a/mysql-test/r/distinct.result
+++ b/mysql-test/r/distinct.result
@@ -190,7 +190,7 @@ insert into t3 select * from t4;
explain select distinct t1.a from t1,t3 where t1.a=t3.a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 4 Using index; Using temporary
-1 SIMPLE t3 ref a a 5 test.t1.a 10 Using where; Using index; Distinct
+1 SIMPLE t3 ref a a 5 test.t1.a 11 Using where; Using index; Distinct
select distinct t1.a from t1,t3 where t1.a=t3.a;
a
1