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

[Reggie Burnett]

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

  859 Reggie Burnett	2010-11-17 [merge]
      merged

    modified:
      CHANGES
      MySql.Data/Provider/Source/CharSetMap.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-11-09 20:31:49 +0000
+++ b/CHANGES	2010-11-17 20:58:20 +0000
@@ -6,6 +6,7 @@
 - fixed MySqlCommand.Clone so that the default command timeoout functionality is not disabled when
   you clone a command (bug #56806)
 - fixed loading of mono.posix assembly to use the right assembly (bug #56410)
+- adding mapping for UTF8MB4 charset introduced with 5.5.3 (bug #58244)
 
 Version 6.1.5
 - Fix authorization popup after modifying stored procedure in VS (Bug #44715)

=== modified file 'MySql.Data/Provider/Source/CharSetMap.cs'
--- a/MySql.Data/Provider/Source/CharSetMap.cs	2010-08-18 19:03:33 +0000
+++ b/MySql.Data/Provider/Source/CharSetMap.cs	2010-11-17 20:58:20 +0000
@@ -141,6 +141,7 @@
             mapping.Add("latvian1", new CharacterSet("iso-8859-13", 1));
             mapping.Add("estonia", new CharacterSet("iso-8859-13", 1));
             mapping.Add("dos", new CharacterSet("ibm437", 1));
+            mapping.Add("utf8mb4", new CharacterSet("utf-8", 4));
         }
 
         internal static void InitCollections(MySqlConnection connection)


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