Commit 0e302f5e authored by unknown's avatar unknown
Browse files

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.


mysql-test/r/ps_2myisam.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_3innodb.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_4heap.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_5merge.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_6bdb.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_7ndb.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
sql-common/my_time.c:
  Merged fix for bug #7297 "Two digit year should be interpreted correctly
  even with zero month and day" into 4.1
sql/item_timefunc.cc:
  Small fix after merging patch solving bug #7515 "from_unixtime(0) now
  returns NULL instead of the Epoch" into 4.1.
parent e107535f

mysql-test/r/ps_2myisam.result

+1 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/r/ps_3innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -3010,7 +3010,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

mysql-test/r/ps_4heap.result

+1 −1
Original line number Diff line number Diff line
@@ -3011,7 +3011,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

mysql-test/r/ps_5merge.result

+2 −2
Original line number Diff line number Diff line
@@ -2947,7 +2947,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
@@ -5957,7 +5957,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

mysql-test/r/ps_6bdb.result

+1 −1
Original line number Diff line number Diff line
@@ -3010,7 +3010,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