[dev.boringcrypto] all: merge master into dev.boringcrypto

Change-Id: Ia8ddd4e52dcfe87f9daef2edd37c8155fcae7f5a

1 files changed, 2 insertions, 3 deletions

diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index 1e7a989089..7537f87d47 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -540,7 +540,7 @@ type driverStmt struct {
 	closeErr    error // return value of previous Close call
 }
 
-// Close ensures dirver.Stmt is only closed once any always returns the same
+// Close ensures driver.Stmt is only closed once and always returns the same
 // result.
 func (ds *driverStmt) Close() error {
 	ds.Lock()
@@ -2735,8 +2735,7 @@ func (rs *Rows) Err() error {
 }
 
 // Columns returns the column names.
-// Columns returns an error if the rows are closed, or if the rows
-// are from QueryRow and there was a deferred error.
+// Columns returns an error if the rows are closed.
 func (rs *Rows) Columns() ([]string, error) {
 	rs.closemu.RLock()
 	defer rs.closemu.RUnlock()