diff options
| author | unknown <monty@mysql.com> | 2004-12-06 01:34:19 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-06 01:34:19 +0200 |
| commit | 289d3b2ee0f912dd4f128e1c61685d7bb170eb90 (patch) | |
| tree | 7f74d4a05c863129cb14dc455d15ba0f49a53002 /mysql-test | |
| parent | 623c733895dd490fce64ec864713279570ea37f3 (diff) | |
| download | mariadb-git-289d3b2ee0f912dd4f128e1c61685d7bb170eb90.tar.gz | |
Fix test results
mysql-test/r/index_merge_ror_cpk.result:
Portability fix
mysql-test/r/innodb.result:
Update results
mysql-test/t/index_merge_ror_cpk.test:
Portability fix
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/index_merge_ror_cpk.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/index_merge_ror_cpk.test | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/index_merge_ror_cpk.result b/mysql-test/r/index_merge_ror_cpk.result index 7acfb8dc93b..ba8efe42bd6 100644 --- a/mysql-test/r/index_merge_ror_cpk.result +++ b/mysql-test/r/index_merge_ror_cpk.result @@ -74,7 +74,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index_merge PRIMARY,key1,pktail2ok pktail2ok,key1 8,4 NULL 199 Using sort_union(pktail2ok,key1); Using where explain select * from t1 where pktail3bad=1 and key1=10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref key1,pktail3bad pktail3bad 4 const 98 Using where +1 SIMPLE t1 ref key1,pktail3bad pktail3bad 4 const ROWS Using where explain select * from t1 where pktail4bad=1 and key1=10; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ref key1,pktail4bad pktail4bad 4 const 99 Using where diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 9f19dd479c8..4cce4ef51e0 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1696,7 +1696,7 @@ Variable_name Value Innodb_rows_inserted 31706 show status like "Innodb_rows_read"; Variable_name Value -Innodb_rows_read 80161 +Innodb_rows_read 80178 show status like "Innodb_rows_updated"; Variable_name Value Innodb_rows_updated 29530 diff --git a/mysql-test/t/index_merge_ror_cpk.test b/mysql-test/t/index_merge_ror_cpk.test index bf8eb5b77c7..867b0b3a036 100644 --- a/mysql-test/t/index_merge_ror_cpk.test +++ b/mysql-test/t/index_merge_ror_cpk.test @@ -72,6 +72,8 @@ explain select * from t1 where pktail2ok=1 and key1=10; select ' The following is actually a deficiency, it uses sort_union currently:' as 'note:'; explain select * from t1 where (pktail2ok=1 and pk1< 50000) or key1=10; +# The expected rows differs a bit from platform to platform +--replace_result 98 ROWS 99 ROWS explain select * from t1 where pktail3bad=1 and key1=10; explain select * from t1 where pktail4bad=1 and key1=10; explain select * from t1 where pktail5bad=1 and key1=10; |