From 8d52c2cffe0ff75ea9a4313c776cc5441e70aef3 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 11 May 2011 13:59:17 +0300 Subject: Fixed compiler warnings and test cases problems found by buildbot mysql-test/r/dyncol.result: Updated test results mysql-test/r/index_intersect.result: Updated results mysql-test/r/index_intersect_innodb.result: Updated results mysql-test/t/dyncol.test: Added replace_result for floating point results that are different on windows Added round() around a result to get same result on all platforms. mysql-test/t/index_intersect.test: Added replace_result to fix that index_merge may put key names in different order. mysys/ma_dyncol.c: Fixed compiler warnings on Solaris sql/key.cc: Fixed compiler warnings on Solaris sql/mysqld.cc: Fixed compiler warning on windows support-files/compiler_warnings.supp: Suppressed an unintersting warning on Solaris --- mysql-test/t/index_intersect.test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mysql-test/t/index_intersect.test') diff --git a/mysql-test/t/index_intersect.test b/mysql-test/t/index_intersect.test index 9ea2f5e3101..c2834e685eb 100644 --- a/mysql-test/t/index_intersect.test +++ b/mysql-test/t/index_intersect.test @@ -136,7 +136,8 @@ EXPLAIN SELECT * FROM City WHERE Name BETWEEN 'G' AND 'J' AND Population > 1000000 AND Country LIKE 'B%'; ---replace_column 9 # +--replace_column 7 # 9 # +--replace_result Population,Country,Name Population,Name,Country EXPLAIN SELECT * FROM City WHERE Name BETWEEN 'G' AND 'K' AND Population > 500000 AND Country LIKE 'C%'; -- cgit v1.2.1