Skip to content

Commit f261741

Browse files
committed
remove dispensable charset check
1 parent bb6e79b commit f261741

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

connection.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,12 @@ func (mc *mysqlConn) handleParams() (err error) {
4747
// Charset
4848
case "charset":
4949
charsets := strings.Split(val, ",")
50-
for _, charset := range charsets {
50+
for i := range charsets {
5151
// ignore errors here - a charset may not exist
52-
err = mc.exec("SET NAMES " + charset)
53-
if err != nil {
54-
continue
55-
}
56-
var value []byte
57-
value, _ = mc.getSystemVar("character_set_connection")
58-
if string(value) == charset {
59-
err = nil
52+
err = mc.exec("SET NAMES " + charsets[i])
53+
if err == nil {
6054
break
6155
}
62-
err = errors.New("Could not set charset " + charset)
6356
}
6457
if err != nil {
6558
return

0 commit comments

Comments
 (0)