ddl: fix TestCancelJob and TestShowIndex tests (pingcap#53)

Defined2014 · Mar 23, 2022 · 0e8e57e · 0e8e57e
1 parent 36f8113
commit 0e8e57e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ddl/cancel_ddl_test.go b/ddl/cancel_ddl_test.go
@@ -758,7 +758,7 @@ func buildDropColumnJob(dbInfo *model.DBInfo, tblInfo *model.TableInfo, colName
 		Type:            model.ActionDropColumn,
 		BinlogInfo:      &model.HistoryInfo{},
 		MultiSchemaInfo: &model.MultiSchemaInfo{},
-		Args:            []interface{}{model.NewCIStr(colName)},
+		Args:            []interface{}{model.NewCIStr(colName), false},
 	}
 }
 

diff --git a/ddl/index.go b/ddl/index.go
@@ -558,7 +558,8 @@ func (w *worker) onCreateIndex(d *ddlCtx, t *meta.Meta, job *model.Job, isPK boo
 		job.SnapshotVer = 0
 		job.SchemaState = model.StateWriteReorganization
 	case model.StateWriteReorganization:
-		done, ver, err := multiSchemaChangeOnCreateIndexFinish(t, job, tblInfo, indexInfo)
+		var done bool
+		done, ver, err = multiSchemaChangeOnCreateIndexFinish(t, job, tblInfo, indexInfo)
 		if done {
 			return ver, err
 		}

diff --git a/ddl/multi_schema_change_test.go b/ddl/multi_schema_change_test.go
@@ -751,7 +751,6 @@ func (i *idxIDExt) IndexID(name string) int64 {
 
 type cancelOnceHook struct {
 	store     kv.Storage
-	dom       *domain.Domain
 	triggered bool
 	cancelErr error
 	pred      func(job *model.Job) bool