fix ci

pingcap · Sep 14, 2018 · 64a5b2e · 64a5b2e
1 parent 74d394a
commit 64a5b2e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -2367,7 +2367,7 @@ func (s *testSuite) TestTimezonePushDown(c *C) {
 	defer tk.MustExec("drop table t")
 	tk.MustExec(`insert into t values ("2018-09-13 10:02:06")`)
 
-	systemTZ := timeutil.Local()
+	systemTZ := timeutil.SystemLocation()
 	c.Assert(systemTZ.String(), Not(Equals), "System")
 	ctx := context.Background()
 	count := 0

diff --git a/expression/builtin_time_test.go b/expression/builtin_time_test.go
@@ -998,7 +998,7 @@ func (s *testEvaluatorSuite) TestSysDate(c *C) {
 	fc := funcs[ast.Sysdate]
 
 	ctx := mock.NewContext()
-	ctx.GetSessionVars().StmtCtx.TimeZone = timeutil.Local()
+	ctx.GetSessionVars().StmtCtx.TimeZone = timeutil.SystemLocation()
 	timezones := []types.Datum{types.NewDatum(1234), types.NewDatum(0)}
 	for _, timezone := range timezones {
 		// sysdate() result is not affected by "timestamp" session variable.

diff --git a/sessionctx/variable/session.go b/sessionctx/variable/session.go
@@ -427,7 +427,7 @@ func (s *SessionVars) GetNextPreparedStmtID() uint32 {
 func (s *SessionVars) Location() *time.Location {
 	loc := s.TimeZone
 	if loc == nil {
-		loc = timeutil.Local()
+		loc = timeutil.SystemLocation()
 	}
 	return loc
 }

diff --git a/sessionctx/variable/varsutil.go b/sessionctx/variable/varsutil.go
@@ -351,7 +351,7 @@ func tidbOptInt64(opt string, defaultVal int64) int64 {
 
 func parseTimeZone(s string) (*time.Location, error) {
 	if strings.EqualFold(s, "SYSTEM") {
-		return timeutil.Local(), nil
+		return timeutil.SystemLocation(), nil
 	}
 
 	loc, err := time.LoadLocation(s)