diff options
| author | unknown <dlenev@mysql.com> | 2004-11-19 21:38:51 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-11-19 21:38:51 +0300 |
| commit | 79997ff7bd68eca896d5113e9150589b69d6f1bb (patch) | |
| tree | c79195aa4584d42521c90539e185e167f65510fc /mysql-test | |
| parent | 4285cd993def4a77360fb0727580ba7189a8415f (diff) | |
| parent | 7c0504ad17f48cfd3fbecfd32705bac6384ce936 (diff) | |
| download | mariadb-git-79997ff7bd68eca896d5113e9150589b69d6f1bb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_time.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 2dc6bffd071..c78b16aed8a 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -474,6 +474,12 @@ unix_timestamp(@a) select unix_timestamp('1969-12-01 19:00:01'); unix_timestamp('1969-12-01 19:00:01') 0 +select from_unixtime(0); +from_unixtime(0) +NULL +select from_unixtime(2145916800); +from_unixtime(2145916800) +NULL CREATE TABLE t1 (datetime datetime, timestamp timestamp, date date, time time); INSERT INTO t1 values ("2001-01-02 03:04:05", "2002-01-02 03:04:05", "2003-01-02", "06:07:08"); SELECT * from t1; diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 67192c55ef9..b9e592fc5d9 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -230,6 +230,13 @@ select unix_timestamp(@a); select unix_timestamp('1969-12-01 19:00:01'); # +# Test for bug #6439 "unix_timestamp() function returns wrong datetime +# values for too big argument". It should return error instead. +# +select from_unixtime(0); +select from_unixtime(2145916800); + +# # Test types from + INTERVAL # |