Move pid to init() and update connattrs handling

Author: dveeden

driver.go

@@ -20,6 +20,8 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"net"
+        "os"
+        "strconv"
 )
 
 // This struct is exported to make the driver directly accessible.
@@ -30,6 +32,8 @@ type MySQLDriver struct{}
 // Custom dial functions must be registered with RegisterDial
 type DialFunc func(addr string) (net.Conn, error)
 
+var pid string
+
 var dials map[string]DialFunc
 
 // RegisterDial registers a custom dial function. It can then be used by the
@@ -145,5 +149,6 @@ func (d MySQLDriver) Open(dsn string) (driver.Conn, error) {
 }
 
 func init() {
+	pid = strconv.Itoa(os.Getpid())
 	sql.Register("mysql", &MySQLDriver{})
 }

packets.go

@@ -16,10 +16,9 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"os"
+        "os"
 	"path"
 	"runtime"
-	"strconv"
 	"time"
 )
 
@@ -238,12 +237,13 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error {
 	// User Password
 	scrambleBuff := scramblePassword(cipher, []byte(mc.cfg.passwd))
 
-	attrs := make(map[string]string)
-	attrs["_os"] = runtime.GOOS
-	attrs["_client_name"] = "Go MySQL Driver"
-	attrs["_pid"] = strconv.Itoa(os.Getpid())
-	attrs["_platform"] = runtime.GOARCH
-	attrs["program_name"] = path.Base(os.Args[0])
+	attrs := map[string]string {
+	    "_os":          runtime.GOOS,
+	    "_client_name": "Go-MySQL-Driver",
+	    "_pid":         pid,
+	    "_platform":    runtime.GOARCH,
+	    "program_name": path.Base(os.Args[0]),
+        }
 
 	attrlen := 0
 	for attrname, attrvalue := range attrs {