diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-11 14:25:42 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-11 14:25:42 -0400 |
| commit | e784504935d1e6e4d5cd458172e9da6915f461bb (patch) | |
| tree | a0ca851c164dde7e6c6f20c2aec3d04aee0cbf3b /mysql-test/r/date_formats.result | |
| parent | 12aa1e1190764e9b9f1096126b33f1f26fa6c126 (diff) | |
| parent | 6fbf96a0d7ad79fe64b728e708354d3614d9a11c (diff) | |
| download | mariadb-git-e784504935d1e6e4d5cd458172e9da6915f461bb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
Diffstat (limited to 'mysql-test/r/date_formats.result')
| -rw-r--r-- | mysql-test/r/date_formats.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 00335d2b1b0..035d98d2b74 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -525,3 +525,9 @@ TIME_FORMAT("24:00:00", '%l %p') SELECT TIME_FORMAT("25:00:00", '%l %p'); TIME_FORMAT("25:00:00", '%l %p') 1 AM +SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896); +DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896) +NULL +Warnings: +Warning 1292 Truncated incorrect datetime value: '%Y-%m-%d %H:%i:%s' +"End of 4.1 tests" |