diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-08-05 20:59:15 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-08-05 20:59:15 +0400 |
| commit | 96340a405ad2fe0d562d3ab73adfe6bf1973fb1c (patch) | |
| tree | 2d2a0b700aa2e1483eb16e3b9721f21100c3b82c /mysql-test | |
| parent | f2b84e305cb49832f477b4b7c786443013c3194e (diff) | |
| parent | c98cd2c8161af772087376247e42a1ab89802097 (diff) | |
| download | mariadb-git-96340a405ad2fe0d562d3ab73adfe6bf1973fb1c.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index b2df98bbfa6..56bc86968b3 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -361,8 +361,8 @@ EXPLAIN SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id WHERE t1.name LIKE 'A%' OR FALSE; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 index NULL fkey 5 NULL 5 Using index -1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.fkey 1 Using where +1 SIMPLE t1 index PRIMARY,name name 23 NULL 3 Using where; Using index +1 SIMPLE t2 ref fkey fkey 5 test.t1.id 1 Using index DROP TABLE t1,t2; CREATE TABLE t1 ( id int NOT NULL, |