cherry pick pingcap#18952 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Sep 4, 2020 · db88db9 · db88db9
1 parent 709b48a
commit db88db9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/session/session.go b/session/session.go
@@ -2049,7 +2049,7 @@ func (s *session) PrepareTxnCtx(ctx context.Context) {
 		SchemaVersion: is.SchemaMetaVersion(),
 		CreateTime:    time.Now(),
 	}
-	if !s.sessionVars.IsAutocommit() {
+	if !s.sessionVars.IsAutocommit() || s.sessionVars.RetryInfo.Retrying {
 		pessTxnConf := config.GetGlobalConfig().PessimisticTxn
 		if pessTxnConf.Enable {
 			if s.sessionVars.TxnMode == ast.Pessimistic {