diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:13:06 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:13:06 +0500 |
| commit | 78ed69c339965238c9047d0e41db6996c5a27d01 (patch) | |
| tree | b8c54abe0649f45196d32077f74dd9ff1d2ad872 /mysql-test/r/cast.result | |
| parent | 563b1297bbeef6f162513be314676d0d2c39b4a9 (diff) | |
| parent | a6da564a1d15925780f45d4bef439d4ae548f70d (diff) | |
| download | mariadb-git-78ed69c339965238c9047d0e41db6996c5a27d01.tar.gz | |
Merge mysql.com:/home/hf/work/27921/my50-27921
into mysql.com:/home/hf/work/27957/my50-27957
mysql-test/r/cast.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/my_decimal.h:
merging
Diffstat (limited to 'mysql-test/r/cast.result')
| -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 c0dab1c3293..6eceeff87e2 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -103,7 +103,7 @@ Warnings: Warning 1292 Truncated incorrect DOUBLE value: 'a' select 10.0+cast('a' as decimal); 10.0+cast('a' as decimal) -10.00 +10.0 Warnings: Warning 1292 Truncated incorrect DECIMAL value: 'a' select 10E+0+'a'; @@ -388,7 +388,7 @@ INSERT INTO t1 VALUES ('1.01', '2.02', '3.03', '4.04', '5.05'); SELECT CAST(v AS DECIMAL), CAST(tt AS DECIMAL), CAST(t AS DECIMAL), CAST(mt AS DECIMAL), CAST(lt AS DECIMAL) from t1; CAST(v AS DECIMAL) CAST(tt AS DECIMAL) CAST(t AS DECIMAL) CAST(mt AS DECIMAL) CAST(lt AS DECIMAL) -1.01 2.02 3.03 4.04 5.05 +1 2 3 4 5 DROP TABLE t1; select cast(NULL as decimal(6)) as t1; t1 |