diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index 088e118df7..c8666653ba 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -2563,6 +2563,9 @@ type Rows struct { } func (rs *Rows) initContextClose(ctx, txctx context.Context) { + if ctx.Done() == nil && (txctx == nil || txctx.Done() == nil) { + return + } ctx, rs.cancel = context.WithCancel(ctx) go rs.awaitDone(ctx, txctx) }