summaryrefslogtreecommitdiff
path: root/mysql-test/r/rowid_order_innodb.result
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2004-05-13 04:50:54 +0400
committerunknown <sergefp@mysql.com>2004-05-13 04:50:54 +0400
commitaa2bd8ec733b1287068b0940d479afe1bfa85fbc (patch)
treedfa18c96f72864608b7b8f606e7b2540675df09b /mysql-test/r/rowid_order_innodb.result
parentfee57535b774e08ab854651badfe59b00b27c185 (diff)
downloadmariadb-git-aa2bd8ec733b1287068b0940d479afe1bfa85fbc.tar.gz
Post-merge fixes (code review fixes will follow)
include/my_base.h: Post-merge fixes mysql-test/r/index_merge_ror_cpk.result: Post-merge fixes mysql-test/r/rowid_order_innodb.result: Post-merge fixes
Diffstat (limited to 'mysql-test/r/rowid_order_innodb.result')
-rw-r--r--mysql-test/r/rowid_order_innodb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rowid_order_innodb.result b/mysql-test/r/rowid_order_innodb.result
index b1de1b37e73..60d237a977c 100644
--- a/mysql-test/r/rowid_order_innodb.result
+++ b/mysql-test/r/rowid_order_innodb.result
@@ -14,7 +14,7 @@ insert into t1 values (-5, 1, 1),
(10, 1, 1);
explain select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 4 Using where
+1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 6 Using where
select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
pk1 key1 key2
-100 1 1