From 9af4cb9545ce481b8d9d4a13acfe26512032e21b Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 1 Feb 2012 19:26:59 +0000 Subject: libgo: Update to weekly.2012-01-27. From-SVN: r183810 --- libgo/go/database/sql/convert.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libgo/go/database/sql/convert.go') diff --git a/libgo/go/database/sql/convert.go b/libgo/go/database/sql/convert.go index 9835e38..e80420e 100644 --- a/libgo/go/database/sql/convert.go +++ b/libgo/go/database/sql/convert.go @@ -40,6 +40,9 @@ func convertAssign(dest, src interface{}) error { case *string: *d = s return nil + case *[]byte: + *d = []byte(s) + return nil } case []byte: switch d := dest.(type) { @@ -50,6 +53,12 @@ func convertAssign(dest, src interface{}) error { *d = s return nil } + case nil: + switch d := dest.(type) { + case *[]byte: + *d = nil + return nil + } } var sv reflect.Value -- cgit v1.1