Skip to content

Commit 33793ab

Browse files
committed
fix error propagation
1 parent 233b6cf commit 33793ab

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

connection.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,16 @@ func (mc *mysqlConn) handleParams() (err error) {
5050
for _, charset := range charsets {
5151
// ignore errors here - a charset may not exist
5252
err = mc.exec("SET NAMES " + charset)
53-
if err == nil {
54-
var value []byte
55-
value, err = mc.getSystemVar("character_set_connection")
56-
if string(value) == charset {
57-
break
58-
}
53+
if err != nil {
54+
continue
5955
}
56+
var value []byte
57+
value, _ = mc.getSystemVar("character_set_connection")
58+
if string(value) == charset {
59+
err = nil
60+
break
61+
}
62+
err = errors.New("Could not set charset " + charset)
6063
}
6164
if err != nil {
6265
return

0 commit comments

Comments
 (0)