diff options
Diffstat (limited to 'libgo/go/database')
| -rw-r--r-- | libgo/go/database/sql/driver/driver.go | 3 | ||||
| -rw-r--r-- | libgo/go/database/sql/sql.go | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libgo/go/database/sql/driver/driver.go b/libgo/go/database/sql/driver/driver.go index 83b2b3f..19a3a4f 100644 --- a/libgo/go/database/sql/driver/driver.go +++ b/libgo/go/database/sql/driver/driver.go @@ -15,7 +15,8 @@ import ( ) // Value is a value that drivers must be able to handle. -// It is either nil or an instance of one of these types: +// It is either nil, a type handled by a database driver's NamedValueChecker +// interface, or an instance of one of these types: // // int64 // float64 diff --git a/libgo/go/database/sql/sql.go b/libgo/go/database/sql/sql.go index 9f4fa14..8f5588e 100644 --- a/libgo/go/database/sql/sql.go +++ b/libgo/go/database/sql/sql.go @@ -2055,14 +2055,14 @@ func (tx *Tx) StmtContext(ctx context.Context, stmt *Stmt) *Stmt { stmt.mu.Unlock() if si == nil { + var ds *driverStmt withLock(dc, func() { - var ds *driverStmt ds, err = stmt.prepareOnConnLocked(ctx, dc) - si = ds.si }) if err != nil { return &Stmt{stickyErr: err} } + si = ds.si } parentStmt = stmt } |