diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-22 09:29:22 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-22 09:29:22 +0400 |
| commit | c77bd19bc6eccf37f5d5cc73e7110d64fc76613e (patch) | |
| tree | 9aa6bb0b02ee99e26b68acfe3603b06be088ba1a /mysql-test/r/date_formats.result | |
| parent | 270d4c9ded4cd76a3cbbb24aa337bac8676a1ea4 (diff) | |
| parent | 8473844792f5b206d9828bb1e195a2188ea4e63e (diff) | |
| download | mariadb-git-c77bd19bc6eccf37f5d5cc73e7110d64fc76613e.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/r/date_formats.result:
merging
Diffstat (limited to 'mysql-test/r/date_formats.result')
| -rw-r--r-- | mysql-test/r/date_formats.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 017631bf8d1..29326d1a217 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -574,4 +574,13 @@ DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896) NULL Warnings: Warning 1292 Incorrect datetime value: '%Y-%m-%d %H:%i:%s' +select str_to_date('04 /30/2004', '%m /%d/%Y'); +str_to_date('04 /30/2004', '%m /%d/%Y') +2004-04-30 +select str_to_date('04/30 /2004', '%m /%d /%Y'); +str_to_date('04/30 /2004', '%m /%d /%Y') +2004-04-30 +select str_to_date('04/30/2004 ', '%m/%d/%Y '); +str_to_date('04/30/2004 ', '%m/%d/%Y ') +2004-04-30 "End of 4.1 tests" |