planner: fix DATA RACE caused by TestTiDBBindingInListToVer175 (#48966)

close #48953
pingcap · Nov 28, 2023 · e116f6c · e116f6c
1 parent 651e770
commit e116f6c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/session/bootstrap.go b/pkg/session/bootstrap.go
@@ -2816,6 +2816,7 @@ func upgradeToVer175(s sessiontypes.Session, ver int64) {
 		return
 	}
 	req := rs.NewChunk(nil)
+	updateStmts := make([]string, 0, 4)
 	for {
 		err = rs.Next(ctx, req)
 		if err != nil {
@@ -2832,13 +2833,18 @@ func upgradeToVer175(s sessiontypes.Session, ver int64) {
 			if originalNormalizedSQL == newNormalizedSQL {
 				continue // no need to update
 			}
-			mustExecute(s, fmt.Sprintf("UPDATE mysql.bind_info SET original_sql='%s' WHERE original_sql='%s'", newNormalizedSQL, originalNormalizedSQL))
+			// must run those update statements outside this loop, otherwise may cause some concurrency problems,
+			// since the current statement over this session has not been finished yet.
+			updateStmts = append(updateStmts, fmt.Sprintf("UPDATE mysql.bind_info SET original_sql='%s' WHERE original_sql='%s'", newNormalizedSQL, originalNormalizedSQL))
 		}
 		req.Reset()
 	}
 	if err := rs.Close(); err != nil {
 		logutil.BgLogger().Fatal("upgradeToVer175 error", zap.Error(err))
 	}
+	for _, updateStmt := range updateStmts {
+		mustExecute(s, updateStmt)
+	}
 }
 
 func upgradeToVer176(s sessiontypes.Session, ver int64) {