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

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

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