done

Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
pingcap · Nov 22, 2023 · 66fa684 · 66fa684
1 parent 7370494
commit 66fa684
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/ddl/backfilling_operators.go b/pkg/ddl/backfilling_operators.go
@@ -648,9 +648,6 @@ func (w *indexIngestWorker) initSessCtx() {
 			return
 		}
 		w.restore = restoreSessCtx(sessCtx)
-		tz := *time.UTC
-		sessCtx.GetSessionVars().TimeZone = &tz
-		sessCtx.GetSessionVars().StmtCtx.SetTimeZone(&tz)
 		if err := initSessCtx(sessCtx,
 			w.reorgMeta.SQLMode,
 			w.reorgMeta.Location,

diff --git a/pkg/ddl/backfilling_scheduler.go b/pkg/ddl/backfilling_scheduler.go
@@ -143,12 +143,18 @@ func newSessCtx(
 	return sessCtx, nil
 }
 
+// initSessCtx initializes the session context. Be careful to the timezone.
 func initSessCtx(
 	sessCtx sessionctx.Context,
 	sqlMode mysql.SQLMode,
 	tzLocation *model.TimeZoneLocation,
 	resGroupName string,
 ) error {
+	// Correct the initial timezone.
+	tz := *time.UTC
+	sessCtx.GetSessionVars().TimeZone = &tz
+	sessCtx.GetSessionVars().StmtCtx.SetTimeZone(&tz)
+
 	// Set the row encode format version.
 	rowFormat := variable.GetDDLReorgRowFormat()
 	sessCtx.GetSessionVars().RowEncoder.Enable = rowFormat != variable.DefTiDBRowFormatV1