bzr commit into connector-net-trunk branch (reggie.burnett:945)

[Reggie Burnett]

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

  945 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-17 19:25:46 +0000
+++ b/CHANGES	2010-11-17 21:05:58 +0000
@@ -7,6 +7,7 @@
 - fixed the installer to require .net 2.0 or .net 4.0 "full" profile since system.web is only supplied with
   the full profile (bug #57654)
 - starting delivering 4.0 variants of MySql.Data and MySql.Web.  This apparently helps Mono 2.8 (bug #56509)
+- adding mapping for UTF8MB4 charset introduced with 5.5.3 (bug #58244)
 
 Version 6.3.5
 - Fix installer bug related to .NET FW 4.0 (bug #56580)

=== modified file 'MySql.Data/Provider/Source/CharSetMap.cs'
--- a/MySql.Data/Provider/Source/CharSetMap.cs	2010-08-18 19:48:34 +0000
+++ b/MySql.Data/Provider/Source/CharSetMap.cs	2010-11-17 20:59:10 +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]