Skip to content

Commit

Permalink
Merge pull request #91 from go-sql-driver/append-fix
Browse files Browse the repository at this point in the history
[bugfix] Fix appending packets
  • Loading branch information
julienschmidt committed Jun 3, 2013
2 parents efc2836 + 0ae2ce5 commit 75bb76e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 5 additions & 3 deletions packets.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 75bb76e

Please sign in to comment.