Update godeps

vendor/github.com/go-sql-driver/mysql/.travis.yml

@@ -5,6 +5,7 @@ go:
   - 1.3
   - 1.4
   - 1.5
+  - 1.6
   - tip
 
 before_script:

vendor/github.com/go-sql-driver/mysql/AUTHORS

@@ -16,6 +16,7 @@ Arne Hormann <arnehormann at gmail.com>
 Carlos Nieto <jose.carlos at menteslibres.net>
 Chris Moos <chris at tech9computers.com>
 Daniel Nichter <nil at codenode.com>
+Daniël van Eeden <git at myname.nl>
 DisposaBoy <disposaboy at dby.me>
 Frederick Mayle <frederickmayle at gmail.com>
 Gustavo Kristic <gkristic at gmail.com>

vendor/github.com/go-sql-driver/mysql/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,7 @@ Please explain the changes you made here.
 
 ### Checklist
 - [ ] Code compiles correctly
-- [ ] Created tests, if possible
+- [ ] Created tests which fail without the change (if possible)
 - [ ] All tests passing
 - [ ] Extended the README / documentation, if necessary
 - [ ] Added myself / the copyright holder to the AUTHORS file

vendor/github.com/go-sql-driver/mysql/README.md

@@ -231,6 +231,8 @@ Default:        false
 
 Allow multiple statements in one query. While this allows batch queries, it also greatly increases the risk of SQL injections. Only the result of the first query is returned, all other results are silently discarded.
 
+When `multiStatements` is used, `?` parameters must only be used in the first statement.
+
 
 ##### `parseTime`
 

vendor/github.com/go-sql-driver/mysql/dsn.go

@@ -29,9 +29,9 @@ var (
 // Config is a configuration parsed from a DSN string
 type Config struct {
 	User         string            // Username
-	Passwd       string            // Password
+	Passwd       string            // Password (requires User)
 	Net          string            // Network type
-	Addr         string            // Network address
+	Addr         string            // Network address (requires Net)
 	DBName       string            // Database name
 	Params       map[string]string // Connection parameters
 	Collation    string            // Connection collation

vendor/github.com/go-sql-driver/mysql/infile.go

@@ -96,6 +96,10 @@ func deferredClose(err *error, closer io.Closer) {
 func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
 	var rdr io.Reader
 	var data []byte
+	packetSize := 16 * 1024 // 16KB is small enough for disk readahead and large enough for TCP
+	if mc.maxWriteSize < packetSize {
+		packetSize = mc.maxWriteSize
+	}
 
 	if idx := strings.Index(name, "Reader::"); idx == 0 || (idx > 0 && name[idx-1] == '/') { // io.Reader
 		// The server might return an an absolute path. See issue #355.
@@ -108,8 +112,6 @@ func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
 		if inMap {
 			rdr = handler()
 			if rdr != nil {
-				data = make([]byte, 4+mc.maxWriteSize)
-
 				if cl, ok := rdr.(io.Closer); ok {
 					defer deferredClose(&err, cl)
 				}
@@ -134,12 +136,8 @@ func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
 				// get file size
 				if fi, err = file.Stat(); err == nil {
 					rdr = file
-					if fileSize := int(fi.Size()); fileSize <= mc.maxWriteSize {
-						data = make([]byte, 4+fileSize)
-					} else if fileSize <= mc.maxPacketAllowed {
-						data = make([]byte, 4+mc.maxWriteSize)
-					} else {
-						err = fmt.Errorf("local file '%s' too large: size: %d, max: %d", name, fileSize, mc.maxPacketAllowed)
+					if fileSize := int(fi.Size()); fileSize < packetSize {
+						packetSize = fileSize
 					}
 				}
 			}
@@ -150,6 +148,7 @@ func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
 
 	// send content packets
 	if err == nil {
+		data := make([]byte, 4+packetSize)
 		var n int
 		for err == nil {
 			n, err = rdr.Read(data[4:])