Connector/NET commit: r1265 - in branches/5.1: Driver Driver/Source TestSuite/Source

[rburnett]

Modified:
   branches/5.1/Driver/MySql.Data.CF.csproj
   branches/5.1/Driver/Source/Connection.cs
   branches/5.1/Driver/Source/SchemaProvider.cs
   branches/5.1/TestSuite/Source/PoolingTests.cs
   branches/5.1/TestSuite/Source/TimeoutAndCancel.cs
Log:
- removed a unused test from PoolingTests.cs
- set the CancelSelect to only work under 5.0 and later
- fixed small bug in GetIndexColumns
- fixed a problem with connection cloning

Modified: branches/5.1/Driver/MySql.Data.CF.csproj
===================================================================
--- branches/5.1/Driver/MySql.Data.CF.csproj	2008-04-28 19:34:45 UTC (rev 1264)
+++ branches/5.1/Driver/MySql.Data.CF.csproj	2008-04-29 16:26:21 UTC (rev 1265)
@@ -61,10 +61,8 @@
     <Compile Include="Source\cf\WinCE.cs" />
     <Compile Include="Source\CharSetMap.cs" />
     <Compile Include="Source\command.cs">
-      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\CommandBuilder.cs">
-      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\common\Cache.cs" />
     <Compile Include="Source\common\ContextString.cs" />
@@ -81,7 +79,6 @@
     </Compile>
     <Compile Include="Source\Crypt.cs" />
     <Compile Include="Source\dataadapter.cs">
-      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\datareader.cs" />
     <Compile Include="Source\Driver.cs" />

Modified: branches/5.1/Driver/Source/Connection.cs
===================================================================
--- branches/5.1/Driver/Source/Connection.cs	2008-04-28 19:34:45 UTC (rev 1264)
+++ branches/5.1/Driver/Source/Connection.cs	2008-04-29 16:26:21 UTC (rev 1265)
@@ -516,7 +516,9 @@
         object ICloneable.Clone()
         {
             MySqlConnection clone = new MySqlConnection();
-            clone.ConnectionString = settings.GetConnectionString(true);
+            string connectionString = settings.GetConnectionString(true);
+            if (connectionString != null)
+                clone.ConnectionString = connectionString;
             return clone;
         }
 

Modified: branches/5.1/Driver/Source/SchemaProvider.cs
===================================================================
--- branches/5.1/Driver/Source/SchemaProvider.cs	2008-04-28 19:34:45 UTC (rev 1264)
+++ branches/5.1/Driver/Source/SchemaProvider.cs	2008-04-29 16:26:21 UTC (rev 1265)
@@ -295,7 +295,8 @@
             dt.Columns.Add("COLUMN_NAME", typeof (string));
             dt.Columns.Add("ORDINAL_POSITION", typeof (int));
 
-            string[] tableRestrictions = new string[restrictions.Length];
+
+            string[] tableRestrictions = new string[Math.Max(restrictions.Length, 4)];
             restrictions.CopyTo(tableRestrictions, 0);
             tableRestrictions[3] = "BASE TABLE";
             DataTable tables = GetTables(tableRestrictions);

Modified: branches/5.1/TestSuite/Source/PoolingTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/PoolingTests.cs	2008-04-28 19:34:45 UTC (rev 1264)
+++ branches/5.1/TestSuite/Source/PoolingTests.cs	2008-04-29 16:26:21 UTC (rev 1265)
@@ -230,62 +230,6 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
Modified: branches/5.1/TestSuite/Source/TimeoutAndCancel.cs
===================================================================
--- branches/5.1/TestSuite/Source/TimeoutAndCancel.cs	2008-04-28 19:34:45 UTC (rev 1264)
+++ branches/5.1/TestSuite/Source/TimeoutAndCancel.cs	2008-04-29 16:26:21 UTC (rev 1265)
@@ -199,6 +199,8 @@
         [Test]
         public void CancelSelect()
         {
+            if (version < new Version(5, 0)) return;
+
             execSQL("CREATE TABLE Test (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20))");
             for (int i=0; i < 10000; i++)
                 execSQL("INSERT INTO Test VALUES (NULL, 'my string')");