Skip to content

Commit 334103f

Browse files
committed
fix packet appending
#91
1 parent 04653f2 commit 334103f

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

driver_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ func TestLongData(t *testing.T) {
612612

613613
dbt.mustExec("CREATE TABLE test (value LONGBLOB)")
614614

615-
in := strings.Repeat(`0`, maxAllowedPacketSize+1)
615+
in := strings.Repeat(`a`, maxAllowedPacketSize+1)
616616
var out string
617617
var rows *sql.Rows
618618

@@ -648,7 +648,11 @@ func TestLongData(t *testing.T) {
648648
dbt.Error("LONGBLOB: unexpexted row")
649649
}
650650
} else {
651-
dbt.Fatalf("LONGBLOB: no data")
651+
if err = rows.Err(); err != nil {
652+
dbt.Fatalf("LONGBLOB: no data (err: %s)", err.Error())
653+
} else {
654+
dbt.Fatal("LONGBLOB: no data (err: <nil>)")
655+
}
652656
}
653657
})
654658
}

packets.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ func (mc *mysqlConn) readPacket() (data []byte, err error) {
5757
return data, nil
5858
}
5959

60+
var buf []byte
61+
buf = append(buf, data...)
62+
6063
// More data
61-
var data2 []byte
62-
data2, err = mc.readPacket()
64+
data, err = mc.readPacket()
6365
if err == nil {
64-
return append(data, data2...), nil
66+
return append(buf, data...), nil
6567
}
6668
}
6769
errLog.Print(err.Error())

0 commit comments

Comments
 (0)