From 25704af0b28e1476428092cf21073cd96663cc71 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Sat, 4 Dec 2010 10:40:07 -0800 Subject: [PATCH] Adjusted results in suite/innodb_plugin/r/innodb_mysql.result. Made range_vs_index_merge.test platform independent --- mysql-test/suite/innodb_plugin/r/innodb_mysql.result | 2 -- mysql-test/t/range_vs_index_merge.test | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql-test/suite/innodb_plugin/r/innodb_mysql.result b/mysql-test/suite/innodb_plugin/r/innodb_mysql.result index 53e979c350f..50ef063e1b4 100644 --- a/mysql-test/suite/innodb_plugin/r/innodb_mysql.result +++ b/mysql-test/suite/innodb_plugin/r/innodb_mysql.result @@ -679,8 +679,6 @@ INSERT INTO t1(b,c) SELECT b,c FROM t2; UPDATE t2 SET c='2007-01-03'; INSERT INTO t1(b,c) SELECT b,c FROM t2; set @@sort_buffer_size=8192; -Warnings: -Warning 1292 Truncated incorrect sort_buffer_size value: '8192' SELECT COUNT(*) FROM t1; COUNT(*) 3072 diff --git a/mysql-test/t/range_vs_index_merge.test b/mysql-test/t/range_vs_index_merge.test index 7ddd2cb5cea..d63a88ebf74 100755 --- a/mysql-test/t/range_vs_index_merge.test +++ b/mysql-test/t/range_vs_index_merge.test @@ -202,6 +202,7 @@ EXPLAIN SELECT * FROM City WHERE (ID < 30) OR (ID BETWEEN 100 AND 150); EXPLAIN SELECT * FROM City WHERE (ID < 200) OR (ID BETWEEN 300 AND 600); +--replace_result 2921 2950 EXPLAIN SELECT * FROM City WHERE (ID < 600) OR (ID BETWEEN 900 AND 1800); EXPLAIN