From 29057b707d468bd690e6eadfebe89c4ff737867c Mon Sep 17 00:00:00 2001
From: Jinzhu <wosmvp@gmail.com>
Date: Thu, 19 May 2022 02:44:00 +0000
Subject: 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>
---
 src/database/sql/sql.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/database/sql/sql.go')

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
 }
 
-- 
cgit v1.3