diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-31 15:49:47 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-31 15:49:47 +0200 |
| commit | 4fbd7817aee31466cf81b5dfcd154eeffd840f67 (patch) | |
| tree | cbfcbc2ab4642ae2fd928103b33aa28fc68e9905 /mysql-test/r | |
| parent | 7355af8fbd20a79adb84e1679a7af0ef23217b04 (diff) | |
| download | mariadb-git-4fbd7817aee31466cf81b5dfcd154eeffd840f67.tar.gz | |
Moved timestamp tests to type_timestamp
Fixed result to new TZ setting
mysql-test/r/type_blob.result:
Moved timestamp tests to type_timestamp
mysql-test/t/type_blob.test:
Moved timestamp tests to type_timestamp
mysql-test/t/type_timestamp.test:
Moved timestamp tests to type_timestamp
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/type_blob.result | 30 | ||||
| -rw-r--r-- | mysql-test/r/type_timestamp.result | 31 |
2 files changed, 30 insertions, 31 deletions
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result index 1daeb4e9f20..0ead1c30200 100644 --- a/mysql-test/r/type_blob.result +++ b/mysql-test/r/type_blob.result @@ -248,36 +248,6 @@ job^M 1 1 test job 1 0000-00-00 00:00:00 1999-02-25 22:43:32 0 High admin 0 tomato test^M job^M 1 1 -stamp -19990402000000 -stamp -19990402000000 -date_format(a,"%Y %y") year(a) year(now()) -2000 00 2000 2000 -ix -19991101000000 -19990102030405 -19990630232922 -19990601000000 -19990930232922 -19990531232922 -19990501000000 -19991101000000 -19990501000000 -date date_time time_stamp -1998-12-31 1998-12-31 23:59:59 19981231235959 -1999-01-01 1999-01-01 00:00:00 19990101000000 -1999-09-09 1999-09-09 23:59:59 19990909235959 -2000-01-01 2000-01-01 00:00:00 20000101000000 -2000-02-28 2000-02-28 00:00:00 20000228000000 -2000-02-29 2000-02-29 00:00:00 20000229000000 -2000-03-01 2000-03-01 00:00:00 20000301000000 -2000-12-31 2000-12-31 23:59:59 20001231235959 -2001-01-01 2001-01-01 00:00:00 20010101000000 -2004-12-31 2004-12-31 23:59:59 20041231235959 -2005-01-01 2005-01-01 00:00:00 20050101000000 -2030-01-01 2030-01-01 00:00:00 20300101000000 -2050-01-01 2050-01-01 00:00:00 20131126000036 a reverse(a) empty ytpme diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/r/type_timestamp.result index 8dcf99ebcd1..8996ca59f7f 100644 --- a/mysql-test/r/type_timestamp.result +++ b/mysql-test/r/type_timestamp.result @@ -1,2 +1,31 @@ t -19700101022034 +19700101032034 +stamp +19990402000000 +stamp +19990402000000 +date_format(a,"%Y %y") year(a) year(now()) +1970 70 1970 1970 +ix +19991101000000 +19990102030405 +19990630232922 +19990601000000 +19990930232922 +19990531232922 +19990501000000 +19991101000000 +19990501000000 +date date_time time_stamp +1998-12-31 1998-12-31 23:59:59 19981231235959 +1999-01-01 1999-01-01 00:00:00 19990101000000 +1999-09-09 1999-09-09 23:59:59 19990909235959 +2000-01-01 2000-01-01 00:00:00 20000101000000 +2000-02-28 2000-02-28 00:00:00 20000228000000 +2000-02-29 2000-02-29 00:00:00 20000229000000 +2000-03-01 2000-03-01 00:00:00 20000301000000 +2000-12-31 2000-12-31 23:59:59 20001231235959 +2001-01-01 2001-01-01 00:00:00 20010101000000 +2004-12-31 2004-12-31 23:59:59 20041231235959 +2005-01-01 2005-01-01 00:00:00 20050101000000 +2030-01-01 2030-01-01 00:00:00 20300101000000 |