Merge pull request #96 from go-sql-driver/clean-up

Clean up

Author: julienschmidt

.gitattributes

@@ -40,7 +40,7 @@ A MySQL-Driver for Go's [database/sql](http://golang.org/pkg/database/sql) packa
   * Optional `time.Time` parsing
 
 ## Requirements
-  * Go 1.0.3 or higher
+  * Go 1.1 or higher (use [v1.0](https://github.com/go-sql-driver/mysql/tags) for Go 1.0.x)
   * MySQL (Version 4.1 or higher), MariaDB or Percona Server
 
 ---------------------------------------

README.md

@@ -35,15 +35,17 @@ type mysqlConn struct {
 }
 
 type config struct {
-	user    string
-	passwd  string
-	net     string
-	addr    string
-	dbname  string
-	params  map[string]string
-	loc     *time.Location
-	timeout time.Duration
-	tls     *tls.Config
+	user            string
+	passwd          string
+	net             string
+	addr            string
+	dbname          string
+	params          map[string]string
+	loc             *time.Location
+	timeout         time.Duration
+	tls             *tls.Config
+	allowAllFiles   bool
+	clientFoundRows bool
 }
 
 // Handles parameters set in DSN
@@ -64,10 +66,6 @@ func (mc *mysqlConn) handleParams() (err error) {
 				return
 			}
 
-		// handled elsewhere
-		case "allowAllFiles", "clientFoundRows":
-			continue
-
 		// time.Time parsing
 		case "parseTime":
 			mc.parseTime = readBool(val)

connection.go

@@ -33,13 +33,8 @@ func (d *mysqlDriver) Open(dsn string) (driver.Conn, error) {
 	}
 
 	// Connect to Server
-	if mc.cfg.timeout > 0 { // with timeout
-		if err == nil {
-			mc.netConn, err = net.DialTimeout(mc.cfg.net, mc.cfg.addr, mc.cfg.timeout)
-		}
-	} else { // no timeout
-		mc.netConn, err = net.Dial(mc.cfg.net, mc.cfg.addr)
-	}
+	nd := net.Dialer{Timeout: mc.cfg.timeout}
+	mc.netConn, err = nd.Dial(mc.cfg.net, mc.cfg.addr)
 	if err != nil {
 		return nil, err
 	}