mysqldef: fix issue #19

pingcap · Sep 6, 2015 · 2e9674f · 2e9674f
1 parent 02d35dd
commit 2e9674f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mysqldef/time.go b/mysqldef/time.go
@@ -143,7 +143,7 @@ func (t Time) Marshal() ([]byte, error) {
 
 	switch t.Type {
 	case TypeDatetime, TypeDate:
-		_, offset := t.Time.Zone()
+		_, offset := time.Now().Zone()
 		// For datetime and date type, we have a trick to marshal.
 		// e.g, if local time is 2010-10-10T10:10:10 UTC+8
 		// we will change this to 2010-10-10T10:10:10 UTC and then marshal.

diff --git a/mysqldef/time_test.go b/mysqldef/time_test.go
@@ -368,10 +368,10 @@ func (s *testTimeSuite) TestParseTimeFromNum(c *C) {
 		{99999999999999, true, zeroDatetimeStr, true, zeroTimestampStr, true, zeroDateStr},
 		{100000000000000, true, zeroDatetimeStr, true, zeroTimestampStr, true, zeroDateStr},
 		{10000102000000, false, "1000-01-02 00:00:00", true, zeroTimestampStr, false, "1000-01-02"},
-		{700101000000, false, "1970-01-01 00:00:00", true, zeroTimestampStr, false, "1970-01-01"},
+		{19690101000000, false, "1969-01-01 00:00:00", true, zeroTimestampStr, false, "1969-01-01"},
 		{991231235959, false, "1999-12-31 23:59:59", false, "1999-12-31 23:59:59", false, "1999-12-31"},
 		{691231235959, false, "2069-12-31 23:59:59", true, zeroTimestampStr, false, "2069-12-31"},
-		{380119031407, false, "2038-01-19 03:14:07", false, "2038-01-19 03:14:07", false, "2038-01-19"},
+		{370119031407, false, "2037-01-19 03:14:07", false, "2037-01-19 03:14:07", false, "2037-01-19"},
 		{380120031407, false, "2038-01-20 03:14:07", true, zeroTimestampStr, false, "2038-01-20"},
 	}