List:Commits« Previous MessageNext Message »
From:Julio Casal Date:June 19 2011 3:41pm
Subject:bzr commit into connector-net-6.3 branch (julio.casal:1007)
View as plain text  
#At file:///D:/Users/jcasalt/Dev/connector-net/6.3/ based on revid:julio.casal@stripped

 1007 Julio Casal	2011-06-19 [merge]
      Merged.

    modified:
      MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs
=== modified file 'MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs'
--- a/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2011-06-19 14:20:42 +0000
+++ b/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2011-06-19 15:41:18 +0000
@@ -865,6 +865,8 @@ namespace MySql.Data.MySqlClient
             object val = null;
             if (value is string && defaultValues[keyword].DefaultValue is Enum)
                 val = ParseEnum(defaultValues[keyword].Type, (string)value, keyword);
+            else if (value is string && string.IsNullOrEmpty(value.ToString()))
+                val = defaultValues[keyword].DefaultValue;
             else
                 val = ChangeType(value, defaultValues[keyword].Type);
             HandleObsolete(keyword, val);

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into connector-net-6.3 branch (julio.casal:1007) Julio Casal19 Jun