Add PayloadWriter.ToPayloadData.

Author: bgrainger

src/MySqlConnector/Protocol/Payloads/ChangeUserPayload.cs

@@ -1,4 +1,3 @@
-using System;
 using MySqlConnector.Protocol.Serialization;
 
 namespace MySqlConnector.Protocol.Payloads
@@ -20,7 +19,7 @@ public static PayloadData Create(string user, byte[] authResponse, string schema
 			if (connectionAttributes != null)
 				writer.Write(connectionAttributes);
 
-			return new PayloadData(writer.ToBytes());
+			return writer.ToPayloadData();
 		}
 	}
 }

src/MySqlConnector/Protocol/Payloads/HandshakeResponse41Payload.cs

@@ -1,4 +1,3 @@
-using System;
 using MySqlConnector.Core;
 using MySqlConnector.Protocol.Serialization;
 
@@ -33,7 +32,7 @@ private static PayloadWriter CreateCapabilitiesPayload(ProtocolCapabilities serv
 		}
 
 		public static PayloadData CreateWithSsl(ProtocolCapabilities serverCapabilities, ConnectionSettings cs, bool useCompression) =>
-			new PayloadData(CreateCapabilitiesPayload(serverCapabilities, cs, useCompression, ProtocolCapabilities.Ssl).ToBytes());
+			CreateCapabilitiesPayload(serverCapabilities, cs, useCompression, ProtocolCapabilities.Ssl).ToPayloadData();
 
 		public static PayloadData Create(InitialHandshakePayload handshake, ConnectionSettings cs, bool useCompression, byte[] connectionAttributes)
 		{
@@ -53,7 +52,7 @@ public static PayloadData Create(InitialHandshakePayload handshake, ConnectionSe
 			if (connectionAttributes != null)
 				writer.Write(connectionAttributes);
 
-			return new PayloadData(writer.ToBytes());
+			return writer.ToPayloadData();
 		}
 	}
 }

src/MySqlConnector/Protocol/Payloads/InitDatabasePayload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Text;
 using MySqlConnector.Protocol.Serialization;
 
@@ -13,7 +12,7 @@ public static PayloadData Create(string databaseName)
 			writer.WriteByte((byte) CommandKind.InitDatabase);
 			writer.Write(Encoding.UTF8.GetBytes(databaseName));
 
-			return new PayloadData(writer.ToBytes());
+			return writer.ToPayloadData();
 		}
 	}
 }

src/MySqlConnector/Protocol/Serialization/PayloadWriter.cs

@@ -65,6 +65,21 @@ public byte[] ToBytes()
 				return m_stream.ToArray();
 		}
 
+		public PayloadData ToPayloadData()
+		{
+			m_writer.Flush();
+			using (m_writer)
+			using (m_stream)
+			{
+#if NETSTANDARD1_3
+				var array = m_stream.ToArray();
+#else
+				var array = m_stream.GetBuffer();
+#endif
+				return new PayloadData(new ArraySegment<byte>(array, 0, checked((int) m_stream.Length)));
+			}
+		}
+
 		readonly MemoryStream m_stream;
 		readonly BinaryWriter m_writer;
 	}