Merge pull request go-sql-driver#91 from go-sql-driver/append-fix

julienschmidt · julienschmidt · commit 75bb76ec381d · 2013-06-03T13:18:27.000-07:00
[bugfix] Fix appending packets
diff --git a/README.md b/README.md
@@ -4,9 +4,7 @@ A MySQL-Driver for Go's [database/sql](http://golang.org/pkg/database/sql) packa
 
 ![Go-MySQL-Driver logo](https://raw.github.com/wiki/go-sql-driver/mysql/go-mysql-driver_m.jpg "Golang Gopher transporting the MySQL Dolphin in a wheelbarrow")
 
-**Current tagged Release:** May 14, 2013 (Version 1.0)
-
-[![Build Status](https://travis-ci.org/go-sql-driver/mysql.png?branch=master)](https://travis-ci.org/go-sql-driver/mysql) *(master branch)*
+**Current tagged Release:** June 03, 2013 (Version 1.0.1)
 
 ---------------------------------------
   * [Features](#features)
diff --git a/packets.go b/packets.go
@@ -57,11 +57,13 @@ func (mc *mysqlConn) readPacket() (data []byte, err error) {
 			return data, nil
 		}
 
+		var buf []byte
+		buf = append(buf, data...)
+
 		// More data
-		var data2 []byte
-		data2, err = mc.readPacket()
+		data, err = mc.readPacket()
 		if err == nil {
-			return append(data, data2...), nil
+			return append(buf, data...), nil
 		}
 	}
 	errLog.Print(err.Error())

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,13 @@ func (mc *mysqlConn) readPacket() (data []byte, err error) {`
`57`	`57`	`return data, nil`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ var buf []byte`
	`61`	`+ buf = append(buf, data...)`
	`62`	`+`
`60`	`63`	`// More data`
`61`		`- var data2 []byte`
`62`		`- data2, err = mc.readPacket()`
	`64`	`+ data, err = mc.readPacket()`
`63`	`65`	`if err == nil {`
`64`		`- return append(data, data2...), nil`
	`66`	`+ return append(buf, data...), nil`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`	`errLog.Print(err.Error())`