test: fix integration-ddl-test (#35014)

close #35020
pingcap · May 30, 2022 · dbce66a · dbce66a
1 parent b598bd2
commit dbce66a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ddl/ddl.go b/ddl/ddl.go
@@ -1165,6 +1165,10 @@ func GetHistoryJobByID(sess sessionctx.Context, id int64) (*model.Job, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer func() {
+		// we can ignore the commit error because this txn is readonly.
+		_ = sess.CommitTxn(context.Background())
+	}()
 	txn, err := sess.Txn(true)
 	if err != nil {
 		return nil, err

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -4431,6 +4431,8 @@ func TestAdminShowDDLJobs(t *testing.T) {
 	// See PR: 11561.
 	job.BinlogInfo = nil
 	job.SchemaName = ""
+	err = sessiontxn.NewTxnInStmt(context.Background(), tk.Session())
+	require.NoError(t, err)
 	txn, err := tk.Session().Txn(true)
 	require.NoError(t, err)
 	err = ddl.AddHistoryDDLJob(meta.NewMeta(txn), job, true)