List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:March 3 2011 5:55pm
Subject:bzr commit into connector-net-6.0 branch (reggie.burnett:863)
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/6.0/ based on revid:reggie.burnett@stripped

  863 Reggie Burnett	2011-03-03
      some CF compilation fixes

    modified:
      MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs
      MySql.Data/Tests/Source/CommandTests.cs
      MySql.Data/Tests/Source/ConnectionStringBuilder.cs
=== modified file 'MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs'
=== modified file 'MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs'
--- a/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2011-02-14 21:11:26 +0000
+++ b/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2011-03-03 17:55:08 +0000
@@ -1062,6 +1062,7 @@
             return connStr.Remove(connStr.Length - 1, 1);
         }
 
+#if !CF
         public override bool ContainsKey(string keyword)
         {
             try
@@ -1074,6 +1075,7 @@
                 return false;
             }
         }
+#endif
 
         /// <summary>
         /// Clears the contents of the <see cref="MySqlConnectionStringBuilder"/> instance. 

=== modified file 'MySql.Data/Tests/Source/CommandTests.cs'
--- a/MySql.Data/Tests/Source/CommandTests.cs	2011-02-14 16:45:56 +0000
+++ b/MySql.Data/Tests/Source/CommandTests.cs	2011-03-03 17:55:08 +0000
@@ -476,7 +476,7 @@
             try 
             {
                 cmd.ExecuteNonQuery();
-                Assert.Fail();
+                Assert.Fail("Should not get here");
             }
             catch (InvalidOperationException ex)
             {

=== modified file 'MySql.Data/Tests/Source/ConnectionStringBuilder.cs'
--- a/MySql.Data/Tests/Source/ConnectionStringBuilder.cs	2011-02-14 21:11:26 +0000
+++ b/MySql.Data/Tests/Source/ConnectionStringBuilder.cs	2011-03-03 17:55:08 +0000
@@ -97,6 +97,7 @@
             Assert.AreEqual("database=test2", s.ConnectionString);
         }
 
+#if !CF
         /// <summary>
         /// Bug #59835	.Net Connector MySqlConnectionStringBuilder wrong result ContainsKey function
         /// </summary>
@@ -111,5 +112,6 @@
             Assert.IsTrue(s.ContainsKey("host"));
             Assert.IsFalse(s.ContainsKey("badkey"));
         }
+#endif
     }
 }


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110303175508-ywpw0uc1mm3vibid.bundle
Thread
bzr commit into connector-net-6.0 branch (reggie.burnett:863) Reggie Burnett3 Mar