Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go/mysql/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,13 @@ func (c *Conn) readEphemeralPacket() ([]byte, error) {
return nil, err
}

c.currentEphemeralPolicy = ephemeralRead
if length == 0 {
// This can be caused by the packet after a packet of
// exactly size MaxPacketSize.
return nil, nil
}

c.currentEphemeralPolicy = ephemeralRead
// Use the bufPool.
if length < MaxPacketSize {
c.currentEphemeralBuffer = bufPool.Get(length)
Expand Down Expand Up @@ -339,13 +339,13 @@ func (c *Conn) readEphemeralPacketDirect() ([]byte, error) {
return nil, err
}

c.currentEphemeralPolicy = ephemeralRead
if length == 0 {
// This can be caused by the packet after a packet of
// exactly size MaxPacketSize.
return nil, nil
}

c.currentEphemeralPolicy = ephemeralRead
if length < MaxPacketSize {
c.currentEphemeralBuffer = bufPool.Get(length)
if _, err := io.ReadFull(r, *c.currentEphemeralBuffer); err != nil {
Expand Down
4 changes: 4 additions & 0 deletions go/mysql/conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ func TestPackets(t *testing.T) {
data := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
verifyPacketComms(t, cConn, sConn, data)

// 0 length packet
data = []byte{}
verifyPacketComms(t, cConn, sConn, data)

// Under the limit, still one packet.
data = make([]byte, MaxPacketSize-1)
data[0] = 0xab
Expand Down