change

pingcap · Aug 29, 2024 · 6d19bbb · 6d19bbb
1 parent f2d5012
commit 6d19bbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/ddl/copr/copr_ctx.go b/pkg/ddl/copr/copr_ctx.go
@@ -19,11 +19,10 @@ import (
 	distsqlctx "github.com/pingcap/tidb/pkg/distsql/context"
 	"github.com/pingcap/tidb/pkg/expression"
 	exprctx "github.com/pingcap/tidb/pkg/expression/context"
-	pmodel "github.com/pingcap/tidb/pkg/parser/model"
-
 	// make sure mock.MockInfoschema is initialized to make sure the test pass
 	_ "github.com/pingcap/tidb/pkg/infoschema"
 	"github.com/pingcap/tidb/pkg/meta/model"
+	pmodel "github.com/pingcap/tidb/pkg/parser/model"
 	"github.com/pingcap/tidb/pkg/table/tables"
 	"github.com/pingcap/tidb/pkg/types"
 )

diff --git a/pkg/session/bootstrap.go b/pkg/session/bootstrap.go
@@ -2597,7 +2597,7 @@ func upgradeToVer104(s sessiontypes.Session, ver int64) {
 	doReentrantDDL(s, "ALTER TABLE mysql.bind_info ADD COLUMN IF NOT EXISTS `plan_digest` varchar(64)")
 }
 
-// For users that upgrade TiDB from a pre-6.0 version, we want to disable tidb cost pmodel.by default to keep plans unchanged.
+// For users that upgrade TiDB from a pre-6.0 version, we want to disable tidb cost model2 by default to keep plans unchanged.
 func upgradeToVer105(s sessiontypes.Session, ver int64) {
 	if ver >= version105 {
 		return