bzr commit into connector-net-6.1 branch (reggie.burnett:820)

[Reggie Burnett]

#At file:///C:/work/bzr-connector-net/6.1/ based on revid:reggie.burnett@stripped

  820 Reggie Burnett	2010-06-25 [merge]
      merged

    modified:
      CHANGES
      MySql.Data/Provider/Source/NativeDriver.cs
      MySql.Data/Tests/Source/PoolingTests.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-06-25 17:41:42 +0000
+++ b/CHANGES	2010-06-25 21:35:58 +0000
@@ -6,6 +6,8 @@
   is not necessarily 1317 (QueryInterrupted). It might as well be 1028 (FileSortAborted).
   Fix timeout handling to handle both error codes in the same fashion (bug #53357)
 - added public MySqlHelper.ExecuteDataReader method that takes an external connection (bug #54570)
+- applied patch from 5.x series that reset the connection to the base encoding when doing a 
+  connection reset (bug #47153)
 
 Version 6.1.4
 - SessionProvider : Avoid SQLNullValueException if lockId returned by select is 

=== modified file 'MySql.Data/Provider/Source/NativeDriver.cs'
--- a/MySql.Data/Provider/Source/NativeDriver.cs	2010-06-24 13:13:40 +0000
+++ b/MySql.Data/Provider/Source/NativeDriver.cs	2010-06-25 21:35:58 +0000
@@ -441,6 +441,7 @@
 
         public override void Reset()
         {
+            stream.Encoding = this.Encoding;
             stream.SequenceByte = 0;
             packet.Clear();
             packet.WriteByte((byte)DBCmd.CHANGE_USER);

=== modified file 'MySql.Data/Tests/Source/PoolingTests.cs'
Binary files a/MySql.Data/Tests/Source/PoolingTests.cs	2010-06-15 14:34:05 +0000 and b/MySql.Data/Tests/Source/PoolingTests.cs	2010-06-25 21:35:03 +0000 differ

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