Connector/NET commit: r718 - in trunk: Driver/Source TestSuite/Source

[rburnett]

Modified:
   trunk/Driver/Source/MySqlConnectionStringBuilder.cs
   trunk/TestSuite/Source/StoredProcedure.cs
Log:
a couple of small cleanups to get everything compiling for the compact framework after the
5.0 merge

Modified: trunk/Driver/Source/MySqlConnectionStringBuilder.cs
===================================================================
--- trunk/Driver/Source/MySqlConnectionStringBuilder.cs	2007-05-11 20:15:44 UTC (rev 717)
+++ trunk/Driver/Source/MySqlConnectionStringBuilder.cs	2007-05-11 20:22:38 UTC (rev 718)
@@ -802,7 +802,7 @@
             persistConnString.Remove(0, persistConnString.Length);
 
             // set all the proper defaults
-            foreach (Keyword k in Enum.GetValues(typeof(Keyword)))
+            foreach (Keyword k in defaultValues.Keys)
                 SetValue(k, defaultValues[k]);
         }
 
@@ -979,7 +979,7 @@
             SetValue(kw, value);
             base[keyword] = value;
             if (kw != Keyword.Password)
-                persistConnString.AppendFormat("{0}={1};", keyword, value);
+                persistConnString.AppendFormat(CultureInfo.InvariantCulture, "{0}={1};",
keyword, value);
         }
 
         private void SetValue(Keyword kw, object value)
@@ -1069,6 +1069,7 @@
             }
         }
 
+#if !CF
         protected override void GetProperties(System.Collections.Hashtable
propertyDescriptors)
         {
             base.GetProperties(propertyDescriptors);
@@ -1106,6 +1107,7 @@
             value = null;
             return false;
         }
+#endif
     }
 
     #region ConnectionProtocolDescriptor

Modified: trunk/TestSuite/Source/StoredProcedure.cs
===================================================================
--- trunk/TestSuite/Source/StoredProcedure.cs	2007-05-11 20:15:44 UTC (rev 717)
+++ trunk/TestSuite/Source/StoredProcedure.cs	2007-05-11 20:22:38 UTC (rev 718)
@@ -373,8 +373,6 @@
 
 		private static void da_FillError(object sender, FillErrorEventArgs e)
 		{
-            if (version < new Version(5, 0)) return;
-
             fillError = e.Errors.Message;
 			e.Continue = true;
 		}