From ebe1ff97fafd541d9c203fcac3e68df035ea83d4 Mon Sep 17 00:00:00 2001
From: shenli <shenli3514@gmail.com>
Date: Thu, 26 Nov 2015 13:58:29 +0800
Subject: [PATCH] tidb: Refactor GetTxn

---
 session.go | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/session.go b/session.go
index ad932a86d9..61da119494 100644
--- a/session.go
+++ b/session.go
@@ -506,17 +506,10 @@ func (s *session) GetTxn(forceNew bool) (kv.Transaction, error) {
 		return s.txn, nil
 	}
 	if forceNew {
-		err = s.txn.Commit()
-		variable.GetSessionVars(s).SetStatusFlag(mysql.ServerStatusInTrans, false)
+		err = s.FinishTxn(false)
 		if err != nil {
-			if !s.retrying && kv.IsRetryableError(err) {
-				err = s.Retry()
-			}
-			if err != nil {
-				return nil, errors.Trace(err)
-			}
+			return nil, errors.Trace(err)
 		}
-		s.resetHistory()
 		s.txn, err = s.store.Begin()
 		if err != nil {
 			return nil, err