Connector/NET commit: r1355 - in branches/5.2: . MySql.Data/Provider/Source MySql.Data/Tests/Source

[rburnett]

Modified:
   branches/5.2/CHANGES
   branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs
   branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs
Log:
- Fixed problem where column metadata was not being read with the correct characterset
  (bug #38721) 


Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2008-07-25 21:10:13 UTC (rev 1354)
+++ branches/5.2/CHANGES	2008-08-12 14:28:31 UTC (rev 1355)
@@ -23,6 +23,8 @@
   user record (bug #38243)
 - moved string escaping routine from the MySqlString class to the MySqlHelper class
   and made it public and static.  (bug #36205)
+- Fixed problem where column metadata was not being read with the correct characterset
+  (bug #38721) 
   
 Version 5.2.2 - 
 - Fixed profile provider that would throw an exception if you were updating

Modified: branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs	2008-07-25 21:10:13 UTC (rev
1354)
+++ branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs	2008-08-12 14:28:31 UTC (rev
1355)
@@ -663,6 +663,7 @@
         {
             MySqlField field;
 
+            stream.Encoding = encoding;
             if (version.isAtLeast(4, 1, 0))
                 field = GetFieldMetaData41();
             else

Modified: branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs	2008-07-25 21:10:13 UTC (rev
1354)
+++ branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs	2008-08-12 14:28:31 UTC (rev
1355)
@@ -532,6 +532,8 @@
 
 
+
 
 
 
 
-
 
@@ -560,6 +562,20 @@
 
 
+
+
+
+
+
+
+