diff options
| author | dlenev@brandersnatch.localdomain <> | 2004-12-30 23:44:42 +0300 |
|---|---|---|
| committer | dlenev@brandersnatch.localdomain <> | 2004-12-30 23:44:42 +0300 |
| commit | cd98fcf4e90e96b7646445d3785101dbe0edd003 (patch) | |
| tree | 034cd41311f5191200ab752ee86ddd489d204b26 /mysql-test/r/ps_2myisam.result | |
| parent | 4ef7ac5c09657afaa09838f9642a9c3f8eff38fd (diff) | |
| download | mariadb-git-cd98fcf4e90e96b7646445d3785101dbe0edd003.tar.gz | |
Merged fixes for bug #7297 "Two digit year should be interpreted
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
Diffstat (limited to 'mysql-test/r/ps_2myisam.result')
| -rw-r--r-- | mysql-test/r/ps_2myisam.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index c2799c6faed..3412f2fe00c 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -3027,7 +3027,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 0010-00-00 0010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL |