diff options
| author | unknown <evgen@moonbone.local> | 2006-07-18 21:30:26 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-18 21:30:26 +0400 |
| commit | 5a77e566abb4c486a296c1ad762ddfe740db695e (patch) | |
| tree | b8a1526d2ca7f9d2334ece2ae6b2a748a2f19444 /mysql-test/r/date_formats.result | |
| parent | e71cf7c457d63640fed0200a6169761eb08655c9 (diff) | |
| parent | 76215977850defe766718d483a2ecf9204b1413f (diff) | |
| download | mariadb-git-5a77e566abb4c486a296c1ad762ddfe740db695e.tar.gz | |
Merge moonbone.local:/work/mysql-4.1
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
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" |