diff options
| author | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2012-12-11 10:51:24 +0530 |
|---|---|---|
| committer | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2012-12-11 10:51:24 +0530 |
| commit | 2f7295575db5153411348abe459b0638f0c81138 (patch) | |
| tree | 8ccc77dfb516b5e3432e54a8061598b42a987353 /mysql-test/suite/innodb | |
| parent | 07a5b266fb783d741f1fdadb4d28b39da1db3b96 (diff) | |
| parent | d426504b9e3e9e92b0c948e912f2b6ffdc89e2d7 (diff) | |
| download | mariadb-git-2f7295575db5153411348abe459b0638f0c81138.tar.gz | |
Merging from mysql-5.1 to mysql-5.5.
Diffstat (limited to 'mysql-test/suite/innodb')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-index.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result index 48390b14a82..5b0fccbe615 100644 --- a/mysql-test/suite/innodb/r/innodb-index.result +++ b/mysql-test/suite/innodb/r/innodb-index.result @@ -956,7 +956,7 @@ Table Op Msg_type Msg_text test.t1 check status OK explain select * from t1 where b like 'adfd%'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL b NULL NULL NULL 15 Using where +1 SIMPLE t1 range b b 769 NULL 11 Using where drop table t1; set global innodb_file_per_table=on; set global innodb_file_format='Barracuda'; 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)); |