From 498d754a1d031d88ba07aafa989e4874dd9f7612 Mon Sep 17 00:00:00 2001 From: Lonng Date: Sat, 28 Sep 2019 23:08:53 +0800 Subject: [PATCH 1/2] session: remove unused global variable Signed-off-by: Lonng --- session/session.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/session/session.go b/session/session.go index 1a36431cc355d..8306421470819 100644 --- a/session/session.go +++ b/session/session.go @@ -393,9 +393,6 @@ func (s *session) FieldList(tableName string) ([]*ast.ResultField, error) { return fields, nil } -// mockCommitErrorOnce use to make sure gofail mockCommitError only mock commit error once. -var mockCommitErrorOnce = true - func (s *session) doCommit(ctx context.Context) error { if !s.txn.Valid() { return nil From 921473e7d86d28a132eeab7937700aa1b7c04dbb Mon Sep 17 00:00:00 2001 From: Lonng Date: Sat, 28 Sep 2019 23:15:06 +0800 Subject: [PATCH 2/2] simplify multiQueryNoDelayRecordSet implementation Signed-off-by: Lonng --- session/session.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/session/session.go b/session/session.go index 8306421470819..e4e513025c458 100644 --- a/session/session.go +++ b/session/session.go @@ -2043,6 +2043,8 @@ func (s *session) recordTransactionCounter(err error) { } type multiQueryNoDelayRecordSet struct { + sqlexec.RecordSet + affectedRows uint64 lastMessage string status uint16 @@ -2050,18 +2052,6 @@ type multiQueryNoDelayRecordSet struct { lastInsertID uint64 } -func (c *multiQueryNoDelayRecordSet) Fields() []*ast.ResultField { - panic("unsupported method") -} - -func (c *multiQueryNoDelayRecordSet) Next(ctx context.Context, chk *chunk.Chunk) error { - panic("unsupported method") -} - -func (c *multiQueryNoDelayRecordSet) NewChunk() *chunk.Chunk { - panic("unsupported method") -} - func (c *multiQueryNoDelayRecordSet) Close() error { return nil }