From: Reggie Burnett
Date: December 9 2010 3:35am
Subject: bzr commit into connector-net-6.1 branch (reggie.burnett:866)
List-Archive: http://lists.mysql.com/commits/126377
Message-Id: <201012090335.oB903wjU015608@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1639758992=="

--===============1639758992==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

  866 Reggie Burnett	2010-12-08 [merge]
      merged

    modified:
      CHANGES
      MySql.Data.Entity/Provider/EFMySqlDataReader.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-11-30 18:31:01 +0000
+++ b/CHANGES	2010-12-09 03:35:41 +0000
@@ -11,6 +11,9 @@
 - fixed our DDEX code so that dragging tables from server explorer onto a typed data set
   preserves the table name (bug #57894)
 - fixed ReadFieldLength to return a long so bigint autoincrement columns can work (bug #58373)
+- fixed bug where older versions of MySQL would present cast(0 as decimal(0,0)) as string 
+  that caused our EF code to throw an exception as it tried to convert that to bool
+  (bug #55349)
 
 Version 6.1.5
 - Fix authorization popup after modifying stored procedure in VS (Bug #44715)

=== modified file 'MySql.Data.Entity/Provider/EFMySqlDataReader.cs'
--- a/MySql.Data.Entity/Provider/EFMySqlDataReader.cs	2010-08-18 19:44:51 +0000
+++ b/MySql.Data.Entity/Provider/EFMySqlDataReader.cs	2010-12-09 03:35:41 +0000
@@ -27,6 +27,7 @@
 using System.Data;
 using System.Data.Metadata.Edm;
 using System.Globalization;
+using System.Text;
 
 namespace MySql.Data.Entity
 {
@@ -207,9 +208,15 @@
 
         private object ChangeType(object sourceValue, Type targetType)
         {
-            if (sourceValue is byte[] && targetType == typeof(Guid))
+            if (sourceValue is byte[])
             {
-                return new Guid((byte[])sourceValue);
+				if (targetType == typeof(Guid))
+					return new Guid((byte[])sourceValue);
+				else if (targetType == typeof(bool))
+				{
+					byte[] bytes = (byte[])sourceValue;
+					return bytes[0] == '1';
+				}
             }
 
             if (sourceValue is DateTime && targetType == typeof(DateTimeOffset))


--===============1639758992==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/reggie.burnett@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: reggie.burnett@stripped\
#   590ct19ze8uz49rs
# target_branch: file:///C:/work/connector-net/6.1/
# testament_sha1: ff28229f561911e54e4b779c7ced3aff10a3be2a
# timestamp: 2010-12-08 21:35:43 -0600
# source_branch: file:///C:/work/connector-net/6.0/
# base_revision_id: reggie.burnett@stripped\
#   supqofg7ijggsm9l
# 
# Begin bundle
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
4u5IpwoSBxWIAGA=


--===============1639758992==--