From: Michael Lewis <mikelikespie@gmail.com>
Date: Tue, 3 Apr 2012 22:36:48 +0000 (-0700)
Subject: [release-branch.go1] sql: Propagate error from subsetTypeArgs in Exec
X-Git-Tag: go1.0.1~45
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ca246227a8d4123f4b66e0b6ae91ebdc37114343;p=gostls13.git

[release-branch.go1] sql: Propagate error from subsetTypeArgs in Exec

««« backport dd8f13acda2e
sql: Propagate error from subsetTypeArgs in Exec

Fixes #3449

R=golang-dev
CC=bradfitz, golang-dev
https://golang.org/cl/5970076

»»»
---

diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go
index 51a357b37d..89136ef6e4 100644
--- a/src/pkg/database/sql/sql.go
+++ b/src/pkg/database/sql/sql.go
@@ -327,6 +327,9 @@ func (db *DB) prepare(query string) (stmt *Stmt, err error) {
 // Exec executes a query without returning any rows.
 func (db *DB) Exec(query string, args ...interface{}) (Result, error) {
 	sargs, err := subsetTypeArgs(args)
+	if err != nil {
+		return nil, err
+	}
 	var res Result
 	for i := 0; i < 10; i++ {
 		res, err = db.exec(query, sargs)