Merge dd34943dc4 into 547861c49b

decimal.go

@@ -1796,19 +1796,18 @@ func (d *Decimal) UnmarshalBinary(data []byte) error {
 
 // MarshalBinary implements the encoding.BinaryMarshaler interface.
 func (d Decimal) MarshalBinary() (data []byte, err error) {
-	// Write the exponent first since it's a fixed size
+	// exp is written first, but encode value first to know output size
-	v1 := make([]byte, 4)
+	var valueData []byte
-	binary.BigEndian.PutUint32(v1, uint32(d.exp))
+	if valueData, err = d.value.GobEncode(); err != nil {
-
+		return nil, err
-	// Add the value
-	var v2 []byte
-	if v2, err = d.value.GobEncode(); err != nil {
-		return
 	}
 
+	// Write the exponent in front, since it's a fixed size
+	expData := make([]byte, 4, len(valueData)+4)
+	binary.BigEndian.PutUint32(expData, uint32(d.exp))
+
 	// Return the byte array
-	data = append(v1, v2...)
+	return append(expData, valueData...), nil
-	return
 }
 
 // Scan implements the sql.Scanner interface for database deserialization.