diff options
author | msvensson@neptunus.(none) <> | 2005-09-28 13:29:13 +0200 |
---|---|---|
committer | msvensson@neptunus.(none) <> | 2005-09-28 13:29:13 +0200 |
commit | 26793f30399edefab62ce92f7461b06f74cb4b3d (patch) | |
tree | 676df6a61a4ed6e001ee98ca0241320849ce84c8 | |
parent | fbf4a5e07962792a918207541a2666a7968df4ca (diff) | |
download | mariadb-git-26793f30399edefab62ce92f7461b06f74cb4b3d.tar.gz |
Correct merge error, warning ended up after new tests from 4.1
-rw-r--r-- | mysql-test/r/cast.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index cecc9c07130..fa8e810cf2b 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -72,6 +72,8 @@ Warning 1292 Truncated incorrect CHAR(4) value: '2004-01-22 21:45:33' select CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)); CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)) 2004 +Warnings: +Warning 1292 Truncated incorrect CHAR(4) value: '2004-01-22 21:45:33' select CAST(0xb3 as signed); CAST(0xb3 as signed) 179 @@ -84,8 +86,6 @@ CAST(0xffffffffffffffff as unsigned) select CAST(0xfffffffffffffffe as signed); CAST(0xfffffffffffffffe as signed) -2 -Warnings: -Warning 1292 Truncated incorrect CHAR(4) value: '2004-01-22 21:45:33' select cast('-10a' as signed integer); cast('-10a' as signed integer) -10 |