aboutsummaryrefslogtreecommitdiff
path: root/src/database/sql/sql.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/database/sql/sql.go')
-rw-r--r--src/database/sql/sql.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index 7592bad1d3..013c03d97a 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -964,12 +964,7 @@ func (db *DB) shortestIdleTimeLocked() time.Duration {
if db.maxLifetime <= 0 {
return db.maxIdleTime
}
-
- min := db.maxIdleTime
- if min > db.maxLifetime {
- min = db.maxLifetime
- }
- return min
+ return min(db.maxIdleTime, db.maxLifetime)
}
// SetMaxIdleConns sets the maximum number of connections in the idle