From: rburnett
Date: September 21 2007 9:01pm
Subject: Connector/NET commit: r1018 - in branches/5.1: . Driver/Source
List-Archive: http://lists.mysql.com/commits/34466
X-Bug: 31090
Message-Id: <200709212101.l8LL18wx029315@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/5.1/CHANGES
   branches/5.1/Driver/Source/datareader.cs
Log:
Changed from using Array.Copy to Buffer.BlockCopy in MySqlDataReader.GetBytes.  This helps with memory usage as we expect the source and destination arrays to not be overlapping. (Bug #31090)

Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES	2007-09-21 20:59:48 UTC (rev 1017)
+++ branches/5.1/CHANGES	2007-09-21 21:01:08 UTC (rev 1018)
@@ -69,7 +69,10 @@
 
   - Fixed problem where fields that were blobs but did not include the BLOB flag were treated
     as binary when they should have been treated as text.  (Bug #30233)    
-    
+  - Changed from using Array.Copy to Buffer.BlockCopy in MySqlDataReader.GetBytes.  This
+    helps with memory usage as we expect the source and destination arrays to not be overlapping.
+    (Bug #31090)
+        
 Version 5.0.8  8/16/2007
   Bug #28706 Log messages are truncated  
   - Fixed a problem with compression over a network.  We were letting the inflate stream read

Modified: branches/5.1/Driver/Source/datareader.cs
===================================================================
--- branches/5.1/Driver/Source/datareader.cs	2007-09-21 20:59:48 UTC (rev 1017)
+++ branches/5.1/Driver/Source/datareader.cs	2007-09-21 21:01:08 UTC (rev 1018)
@@ -276,7 +276,7 @@
 				length = (int)((ulong)binary.Value.Length - (ulong)dataIndex);
 			}
 
-			Array.Copy(bytes, (int)dataIndex, buffer, (int)bufferIndex, (int)length);
+			Buffer.BlockCopy(bytes, (int)dataIndex, buffer, (int)bufferIndex, (int)length);
 
 			return length;
 		}