session: do not add history for pessimistic transaction (#10824)

pingcap · Jun 17, 2019 · 089358d · 089358d
1 parent 23d8d2b
commit 089358d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/session/pessimistic_test.go b/session/pessimistic_test.go
@@ -84,6 +84,7 @@ func (s *testPessimisticSuite) TestPessimisticTxn(c *C) {
 	// Update can see the change, so this statement affects 0 roews.
 	tk1.MustExec("update pessimistic set v = 3 where v = 1")
 	c.Assert(tk1.Se.AffectedRows(), Equals, uint64(0))
+	c.Assert(session.GetHistory(tk1.Se).Count(), Equals, 0)
 	// select for update can see the change of another transaction.
 	tk1.MustQuery("select * from pessimistic for update").Check(testkit.Rows("1 2"))
 	// plain select can not see the change of another transaction.

diff --git a/session/tidb.go b/session/tidb.go
@@ -223,7 +223,7 @@ func runStmt(ctx context.Context, sctx sessionctx.Context, s sqlexec.Statement)
 	// All the history should be added here.
 	sessVars.TxnCtx.StatementCount++
 	if !s.IsReadOnly(sessVars) {
-		if err == nil {
+		if err == nil && !sessVars.TxnCtx.IsPessimistic {
 			GetHistory(sctx).Add(0, s, se.sessionVars.StmtCtx)
 		}
 		if txn, err1 := sctx.Txn(false); err1 == nil {