aboutsummaryrefslogtreecommitdiff
path: root/src/database/sql/sql.go
diff options
context:
space:
mode:
authorJinzhu <wosmvp@gmail.com>2022-05-19 02:44:00 +0000
committerDaniel Theophanes <kardianos@gmail.com>2022-05-19 20:21:12 +0000
commit29057b707d468bd690e6eadfebe89c4ff737867c (patch)
tree43eea83d17246f982b659eb13a553d7fc6e6cbc5 /src/database/sql/sql.go
parent97ce98ac203e76fc1a1e902226277dc00456b41b (diff)
downloadgo-29057b707d468bd690e6eadfebe89c4ff737867c.tar.xz
database/sql: fix close rows error ignored in Next
Change-Id: I19f0d764e2a6122307f3f26a6dd3be7b1155c73b GitHub-Last-Rev: 9f1f883c452201679a2d2af2cc29de0f09a43f28 GitHub-Pull-Request: golang/go#52756 Reviewed-on: https://go-review.googlesource.com/c/go/+/404794 Reviewed-by: Daniel Theophanes <kardianos@gmail.com> Reviewed-by: Bryan Mills <bcmills@google.com> Reviewed-by: Michael Knyszek <mknyszek@google.com> Run-TryBot: Daniel Theophanes <kardianos@gmail.com> TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/database/sql/sql.go')
-rw-r--r--src/database/sql/sql.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index 04897b3360..854a895281 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -3331,6 +3331,8 @@ func (rs *Rows) close(err error) error {
rs.closeStmt.Close()
}
rs.releaseConn(err)
+
+ rs.lasterr = rs.lasterrOrErrLocked(err)
return err
}