diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 10:27:11 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 10:27:11 +0400 |
| commit | ca0658d4712f0d3a528224b45b893413af7831c5 (patch) | |
| tree | 8cb6416b1a17ef8773d2d50520fd9a765609fc41 /mysql-test/r/date_formats.result | |
| parent | bd82fb526aaf8afd3d47822c3ad37b49f8e3da68 (diff) | |
| parent | 8473844792f5b206d9828bb1e195a2188ea4e63e (diff) | |
| download | mariadb-git-ca0658d4712f0d3a528224b45b893413af7831c5.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
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 bbe3aee1fb0..0f7f23b7f2c 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -571,4 +571,13 @@ DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896) NULL Warnings: Warning 1292 Truncated 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" |