diff options
| author | Ian Gudger <ian@loosescre.ws> | 2015-10-01 03:29:27 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2015-10-02 14:38:02 +0000 |
| commit | 73fe61233be672db13eeaa277aebb98c16c95996 (patch) | |
| tree | a9dca3d3a07c89d5195596b5ca5151c709f3e8a7 /src/database/sql/sql.go | |
| parent | f80ff56a7d7044940ba85ead49215a1f0fd2af4e (diff) | |
| download | go-73fe61233be672db13eeaa277aebb98c16c95996.tar.xz | |
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 <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/database/sql/sql.go')
| -rw-r--r-- | src/database/sql/sql.go | 4 |
1 files changed, 2 insertions, 2 deletions
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() |