bzr commit into connector-net-6.0 branch (reggie.burnett:746)

[Reggie Burnett]

#At file:///D:/bzr-connector-net/6.0/ based on revid:reggie.burnett@stripped

  746 Reggie Burnett	2009-08-20
      - sped up MySqlPacket.ReadString slightly by avoiding creating a new temp buffer each time

    modified:
      CHANGES
      MySql.Data/Provider/Source/MySqlPacket.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2009-08-17 15:56:08 +0000
+++ b/CHANGES	2009-08-20 20:02:17 +0000
@@ -26,6 +26,7 @@
 - fixed timestamp columns with entity framework (bug #46311)  
 - fixed sql generation bug with table editor. This bug would cause the data type
   to be repeated in some cases when a table was altered.  
+- sped up MySqlPacket.ReadString slightly by avoiding creating a new temp buffer each time  
   
 Version 6.0.4
 - fixed regression where using stored procs with datasets (bug #44460)

=== modified file 'MySql.Data/Provider/Source/MySqlPacket.cs'
--- a/MySql.Data/Provider/Source/MySqlPacket.cs	2009-08-05 00:15:23 +0000
+++ b/MySql.Data/Provider/Source/MySqlPacket.cs	2009-08-20 20:02:17 +0000
@@ -284,9 +284,8 @@
         {
             if (length == 0)
                 return String.Empty;
-            byte[] buf = new byte[length];
-            Read(buf, 0, (int)length);
-            return encoding.GetString(buf, 0, buf.Length);
+            Read(tempBuffer, 0, (int)length);
+            return encoding.GetString(tempBuffer, 0, (int)length);
         }
 
         public string ReadString()
@@ -305,18 +304,5 @@
         }
 
         #endregion        
-
-/*        public void EnsureCapacity(int newLength)
-        {
-            if (buffer == null)
-                buffer = new byte[newLength];
-            else
-            {
-                if (buffer.Length >= newLength) return;
-                byte[] newBuffer = new byte[newLength];
-                System.Buffer.BlockCopy(buffer, pos, newBuffer, pos, len - pos);
-                buffer = newBuffer;
-            }
-        }*/
     }
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]