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
This commit is contained in:
unknown 2004-05-13 04:50:54 +04:00
commit aa2bd8ec73
3 changed files with 7 additions and 7 deletions

View file

@ -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