Merge pull request #6249 from planetscale/jacques_6240

Fix issue #6240. PR #6130 did not take the header length offset into
vitessio · Jun 8, 2020 · e13de6f · e13de6f
2 parents 8f6c690 + 28b1337
commit e13de6f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/go/mysql/query.go b/go/mysql/query.go
@@ -1087,7 +1087,7 @@ func (c *Conn) writeBinaryRow(fields []*querypb.Field, row []sqltypes.Value) err
 
  for i, val := range row {
  if val.IsNull() {
- bytePos := (i+2)/8 + 1
+ bytePos := (i+2)/8 + 1 + packetHeaderSize
  bitPos := (i + 2) % 8
  data[bytePos] |= 1 << uint(bitPos)
  } else {