summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r/innodb_mysql.result
diff options
context:
space:
mode:
authorAnnamalai Gurusami <annamalai.gurusami@oracle.com>2012-12-11 10:51:24 +0530
committerAnnamalai Gurusami <annamalai.gurusami@oracle.com>2012-12-11 10:51:24 +0530
commit2f7295575db5153411348abe459b0638f0c81138 (patch)
tree8ccc77dfb516b5e3432e54a8061598b42a987353 /mysql-test/suite/innodb/r/innodb_mysql.result
parent07a5b266fb783d741f1fdadb4d28b39da1db3b96 (diff)
parentd426504b9e3e9e92b0c948e912f2b6ffdc89e2d7 (diff)
downloadmariadb-git-2f7295575db5153411348abe459b0638f0c81138.tar.gz
Merging from mysql-5.1 to mysql-5.5.
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb_mysql.result')
-rw-r--r--mysql-test/suite/innodb/r/innodb_mysql.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index b6976e43bcb..96ff02e2585 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -343,7 +343,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index NULL PRIMARY 5 NULL 4 Using index; Using temporary
explain select distinct f1, f2 from t1;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 range NULL PRIMARY 5 NULL 3 Using index for group-by; Using temporary
+1 SIMPLE t1 index NULL PRIMARY 5 NULL 4 Using index
drop table t1;
CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),
INDEX (name));