diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 10:03:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 10:03:28 +0100 |
| commit | 6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d (patch) | |
| tree | 5a7e05e0a9abb5f5cc2672bc3d545ac3f5f7fa43 /mysql-test/r/date_formats.result | |
| parent | 102a7a2a763dc5f2da8dd1f9ca9a53664c5aad6a (diff) | |
| parent | e308d7417bc4ceb1b3b72cac2642015b88f310ff (diff) | |
| download | mariadb-git-6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d.tar.gz | |
5.3 merge
Diffstat (limited to 'mysql-test/r/date_formats.result')
| -rw-r--r-- | mysql-test/r/date_formats.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 7f69fd1a5a4..3bbd25cbbcc 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -521,7 +521,7 @@ 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 +1151414896 Warnings: Warning 1292 Incorrect datetime value: '%Y-%m-%d %H:%i:%s' select str_to_date('04 /30/2004', '%m /%d/%Y'); |