diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-11 13:59:17 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-11 13:59:17 +0300 |
| commit | 8d52c2cffe0ff75ea9a4313c776cc5441e70aef3 (patch) | |
| tree | 3207cd9a232e3eea31aa0976436290d221fe3299 /mysql-test/r/dyncol.result | |
| parent | 052d1bfb1a215d927e31bbe521a7e29d5da8a384 (diff) | |
| download | mariadb-git-8d52c2cffe0ff75ea9a4313c776cc5441e70aef3.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/dyncol.result')
| -rw-r--r-- | mysql-test/r/dyncol.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result index a8480599129..850c7519784 100644 --- a/mysql-test/r/dyncol.result +++ b/mysql-test/r/dyncol.result @@ -444,9 +444,9 @@ column_get(column_create(1, "8:46:06.23434" AS time), 1 as double) select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double); column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double) 20110405084606.2 -select column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double(20,6)); -column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double(20,6)) -20110405084606.234375 +select round(column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double(20,6)),3); +round(column_get(column_create(1, "2011-04-05 8:46:06.23434" AS datetime), 1 as double(20,6)),3) +20110405084606.234 select column_get(column_create(1, NULL AS double), 1 as double); column_get(column_create(1, NULL AS double), 1 as double) NULL |