diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 17:59:46 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 17:59:46 +0400 |
| commit | 5f7b3a8266e22038265bee32cf7f34d86b4e974b (patch) | |
| tree | 6569ee1a7f2cc471beb121b4c82ea46987293bb1 /mysql-test/r/date_formats.result | |
| parent | f4821225c78c2f1c07db94a543e236edbcf9e50c (diff) | |
| download | mariadb-git-5f7b3a8266e22038265bee32cf7f34d86b4e974b.tar.gz | |
after-merge fix-up.
Diffstat (limited to 'mysql-test/r/date_formats.result')
| -rw-r--r-- | mysql-test/r/date_formats.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 4b5efbd83ca..cf3495ef26d 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -212,12 +212,12 @@ Tuesday 52 2001 %W %V %X 2002-01-01 00:00:00 15-01-20 %d-%m-%y 2020-01-15 00:00:00 15-2001-1 %d-%Y-%c 2001-01-15 00:00:00 Warnings: -Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:20:10' -Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:20:10' -Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:20:10' -Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:20:10' -Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:20:10' -Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:20:10.440000' +Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10' +Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10' +Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10' +Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10' +Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10' +Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10.440000' select date,format,DATE(str_to_date(date, format)) as date2 from t1; date format date2 2003-01-02 10:11:12 %Y-%m-%d %H:%i:%S 2003-01-02 |