From 423e9b6220b0b51e496e3b75436842b7dbcb0b50 Mon Sep 17 00:00:00 2001
From: Lynn <zimu_xia@126.com>
Date: Mon, 29 Oct 2018 19:06:35 +0800
Subject: [PATCH] =?UTF-8?q?*:=20fix=20the=20issue=20of=20executing=20DDL?=
 =?UTF-8?q?=20after=20executing=20SQL=20failure=20in=20txn=20=E2=80=A6=20(?=
 =?UTF-8?q?#8056)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ddl/ddl.go              |  5 -----
 ddl/foreign_key_test.go |  4 +++-
 executor/ddl.go         |  5 +++++
 executor/ddl_test.go    | 17 +++++++++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ddl/ddl.go b/ddl/ddl.go
index ce00d89adc829..768a2f3be3f7e 100644
--- a/ddl/ddl.go
+++ b/ddl/ddl.go
@@ -476,11 +476,6 @@ func (d *ddl) asyncNotifyWorker(jobTp model.ActionType) {
 }
 
 func (d *ddl) doDDLJob(ctx sessionctx.Context, job *model.Job) error {
-	// For every DDL, we must commit current transaction.
-	if err := ctx.NewTxn(); err != nil {
-		return errors.Trace(err)
-	}
-
 	// Get a global job ID and put the DDL job in the queue.
 	err := d.addDDLJob(ctx, job)
 	if err != nil {
diff --git a/ddl/foreign_key_test.go b/ddl/foreign_key_test.go
index 7fdde31834477..75f5700a6b614 100644
--- a/ddl/foreign_key_test.go
+++ b/ddl/foreign_key_test.go
@@ -78,7 +78,9 @@ func (s *testForeighKeySuite) testCreateForeignKey(c *C, tblInfo *model.TableInf
 		BinlogInfo: &model.HistoryInfo{},
 		Args:       []interface{}{fkInfo},
 	}
-	err := s.d.doDDLJob(s.ctx, job)
+	err := s.ctx.NewTxn()
+	c.Assert(err, IsNil)
+	err = s.d.doDDLJob(s.ctx, job)
 	c.Assert(err, IsNil)
 	return job
 }
diff --git a/executor/ddl.go b/executor/ddl.go
index d972c69a7b18e..34b4744385083 100644
--- a/executor/ddl.go
+++ b/executor/ddl.go
@@ -67,6 +67,11 @@ func (e *DDLExec) Next(ctx context.Context, chk *chunk.Chunk) (err error) {
 		return nil
 	}
 	e.done = true
+
+	// For each DDL, we should commit the previous transaction and create a new transaction.
+	if err = e.ctx.NewTxn(); err != nil {
+		return errors.Trace(err)
+	}
 	defer func() { e.ctx.GetSessionVars().StmtCtx.IsDDLJobInQueue = false }()
 
 	switch x := e.stmt.(type) {
diff --git a/executor/ddl_test.go b/executor/ddl_test.go
index b91a57b4b1559..45884d1c01e64 100644
--- a/executor/ddl_test.go
+++ b/executor/ddl_test.go
@@ -46,6 +46,23 @@ func (s *testSuite) TestTruncateTable(c *C) {
 	result.Check(nil)
 }
 
+// TestInTxnExecDDLFail tests the following case:
+//  1. Execute the SQL of "begin";
+//  2. A SQL that will fail to execute;
+//  3. Execute DDL.
+func (s *testSuite) TestInTxnExecDDLFail(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("create table t (i int key);")
+	tk.MustExec("insert into t values (1);")
+	tk.MustExec("begin;")
+	tk.MustExec("insert into t values (1);")
+	_, err := tk.Exec("truncate table t;")
+	c.Assert(err.Error(), Equals, "[kv:1062]Duplicate entry '1' for key 'PRIMARY'")
+	result := tk.MustQuery("select count(*) from t")
+	result.Check(testkit.Rows("1"))
+}
+
 func (s *testSuite) TestCreateTable(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")