Connector/NET commit: r1439 - 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/Driver.cs
   branches/5.2/MySql.Data/Provider/Source/Field.cs
   branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs
Log:
fixed bug where specifying 'functions return string=yes' would cause strings to be
returned using the 'binary' charset which would not properly render some characters.  Now
the connection character set is used. (bug #40076)  


Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2008-10-10 20:28:06 UTC (rev 1438)
+++ branches/5.2/CHANGES	2008-10-20 19:28:41 UTC (rev 1439)
@@ -21,6 +21,9 @@
 - implemented Disposable pattern on MySqlTransaction class so including one in a using
statement
   and then not calling commit will cause a rollback when the using exits (bug #39817)
 - fixed MySqlScript object so that it handles scripts with user variables
+- fixed bug where specifying 'functions return string=yes' would cause strings to be
returned
+  using the 'binary' charset which would not properly render some characters.  Now the 
+  connection character set is used. (bug #40076)  
   
   
 Version 5.2.3 - 8/14/08

Modified: branches/5.2/MySql.Data/Provider/Source/Driver.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/Driver.cs	2008-10-10 20:28:06 UTC (rev 1438)
+++ branches/5.2/MySql.Data/Provider/Source/Driver.cs	2008-10-20 19:28:41 UTC (rev 1439)
@@ -132,6 +132,11 @@
             get { return maxPacketSize; }
         }
 
+        internal int ConnectionCharSetIndex
+        {
+            get { return serverCharSetIndex; }
+        }
+
         #endregion
 
         public string Property(string key)

Modified: branches/5.2/MySql.Data/Provider/Source/Field.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/Field.cs	2008-10-10 20:28:06 UTC (rev 1438)
+++ branches/5.2/MySql.Data/Provider/Source/Field.cs	2008-10-20 19:28:41 UTC (rev 1439)
@@ -190,6 +190,9 @@
                 connection.Settings.FunctionsReturnString)
             {
                 mySqlDbType = MySqlDbType.VarString;
+                // we are treating a binary as string so we have to choose some
+                // charset index.  Connection seems logical.
+                CharacterSetIndex = connection.driver.ConnectionCharSetIndex;
                 binaryOk = false;
             }
 

Modified: branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs	2008-10-10 20:28:06 UTC (rev
1438)
+++ branches/5.2/MySql.Data/Tests/Source/CharacterSetTests.cs	2008-10-20 19:28:41 UTC (rev
1439)
@@ -634,6 +634,50 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+