diff options
| author | unknown <aivanov@mysql.com> | 2006-01-10 19:22:47 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-01-10 19:22:47 +0300 |
| commit | a44c687b49b15d2b2e48b3daf8b51442060ac488 (patch) | |
| tree | 72e47319df6a4db84919e8e6328a9bd021725b4f | |
| parent | 935ad7e8f376805f435d6e105d337efb54a31379 (diff) | |
| parent | 29818203eb54980c4ceeca4681592617882505df (diff) | |
| download | mariadb-git-a44c687b49b15d2b2e48b3daf8b51442060ac488.tar.gz | |
Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
into mysql.com:/home/alexi/dev/mysql-5.0-15805
mysql-test/r/type_time.result:
Auto merged
sql/sql_acl.cc:
Auto merged
| -rw-r--r-- | mysql-test/r/type_time.result | 24 | ||||
| -rw-r--r-- | mysql-test/t/type_time.test | 16 |
2 files changed, 10 insertions, 30 deletions
diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result index deb60a95f21..442435b0459 100644 --- a/mysql-test/r/type_time.result +++ b/mysql-test/r/type_time.result @@ -85,27 +85,3 @@ sec_to_time(time_to_sec(t)) 13:00:00 09:00:00 drop table t1; -SELECT CAST(235959.123456 AS TIME); -CAST(235959.123456 AS TIME) -23:59:59.123456 -SELECT CAST(0.235959123456e+6 AS TIME); -CAST(0.235959123456e+6 AS TIME) -23:59:59.123456 -SELECT CAST(235959123456e-6 AS TIME); -CAST(235959123456e-6 AS TIME) -23:59:59.123456 -SELECT CAST(235959.1234567 AS TIME); -CAST(235959.1234567 AS TIME) -23:59:59.123456 -Warnings: -Warning 1292 Truncated incorrect time value: '235959.1234567' -SELECT CAST(0.2359591234567e6 AS TIME); -CAST(0.2359591234567e6 AS TIME) -23:59:59.123456 -Warnings: -Warning 1292 Truncated incorrect time value: '235959.1234567' -SELECT CAST(0.2359591234567e+30 AS TIME); -CAST(0.2359591234567e+30 AS TIME) -NULL -Warnings: -Warning 1292 Truncated incorrect time value: '2.359591234567e+29' diff --git a/mysql-test/t/type_time.test b/mysql-test/t/type_time.test index 9abfe914335..cb7e4f85ad1 100644 --- a/mysql-test/t/type_time.test +++ b/mysql-test/t/type_time.test @@ -26,13 +26,17 @@ drop table t1; # long fraction part and/or large exponent part. # # These must return normal result: -SELECT CAST(235959.123456 AS TIME); -SELECT CAST(0.235959123456e+6 AS TIME); -SELECT CAST(235959123456e-6 AS TIME); +# ########################################################## +# To be uncommented after fix BUG #15805 +# ########################################################## +# SELECT CAST(235959.123456 AS TIME); +# SELECT CAST(0.235959123456e+6 AS TIME); +# SELECT CAST(235959123456e-6 AS TIME); # These must cut fraction part and produce warning: -SELECT CAST(235959.1234567 AS TIME); -SELECT CAST(0.2359591234567e6 AS TIME); +# SELECT CAST(235959.1234567 AS TIME); +# SELECT CAST(0.2359591234567e6 AS TIME); # This must return NULL and produce warning: -SELECT CAST(0.2359591234567e+30 AS TIME); +# SELECT CAST(0.2359591234567e+30 AS TIME); +# ########################################################## # End of 4.1 tests |