From 73fe61233be672db13eeaa277aebb98c16c95996 Mon Sep 17 00:00:00 2001 From: Ian Gudger Date: Thu, 1 Oct 2015 03:29:27 -0700 Subject: database/sql: fix case where Stmt.Close discards error Fixes a case where the Stmt.Close() function in database/sql discards any error generated by the Close() function of the contained driverStmt. Fixes #12798 Change-Id: I40384d6165856665b062d15a643e4ecc09d63fda Reviewed-on: https://go-review.googlesource.com/15178 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/database/sql/sql.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/database/sql/sql.go') diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index 8a2d781330..fbb0e594a5 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -1576,9 +1576,9 @@ func (s *Stmt) Close() error { s.closed = true if s.tx != nil { - s.txsi.Close() + err := s.txsi.Close() s.mu.Unlock() - return nil + return err } s.mu.Unlock() -- cgit v1.3