diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-08 14:46:32 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-08 14:46:32 +0300 |
| commit | 03483e7bfd21a61fca796a163376b77cd965870e (patch) | |
| tree | c51c1f3dd04f3a21815820feb08f6cd6778b7271 /mysql-test/r/warnings.result | |
| parent | 5ab92b1f850c62718907d166b47553440502043c (diff) | |
| parent | e843297d128b165125d17aab8958f7ca91808923 (diff) | |
| download | mariadb-git-03483e7bfd21a61fca796a163376b77cd965870e.tar.gz | |
Merge with main 5.3
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 1c75e415b75..34eb4db00c7 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -324,7 +324,7 @@ select CAST(a AS DECIMAL(13,5)) FROM (SELECT '' as a) t; CAST(a AS DECIMAL(13,5)) 0.00000 Warnings: -Error 1657 Encountered illegal value '' when converting to DECIMAL +Error 1659 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '' create table t1 (a integer unsigned); insert into t1 values (1),(-1),(0),(-2); |