bzr commit into connector-net-trunk branch (reggie.burnett:900)

[Reggie Burnett]

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

  900 Reggie Burnett	2010-07-25
      a few test cases fixes

    modified:
      MySql.Data/Provider/Properties/VersionInfo.cs
      MySql.Data/Provider/Source/Installer.cs
      MySql.Data/Provider/Source/common/MySqlTokenizer.cs
      MySql.Data/Tests/Source/ConnectionTests.cs
      MySql.Data/Tests/Source/PoolingTests.cs
      MySql.Data/Tests/Source/Syntax2.cs
      MySql.Web/Providers/Source/Install.cs
=== modified file 'MySql.Data/Provider/Properties/VersionInfo.cs'
=== modified file 'MySql.Data/Provider/Properties/VersionInfo.cs'
--- a/MySql.Data/Provider/Properties/VersionInfo.cs	2010-04-27 18:31:24 +0000
+++ b/MySql.Data/Provider/Properties/VersionInfo.cs	2010-07-26 01:20:47 +0000
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("6.3.2")]
+[assembly: AssemblyVersion("6.3.3")]
 

=== modified file 'MySql.Data/Provider/Source/Installer.cs'
--- a/MySql.Data/Provider/Source/Installer.cs	2010-07-20 19:53:09 +0000
+++ b/MySql.Data/Provider/Source/Installer.cs	2010-07-26 01:20:47 +0000
@@ -72,7 +72,7 @@
 
         private static void UpdateMachineConfigs(string rootPath, bool add)
         {
-            string[] dirs = new string[2] { "v2.0.50727", "4.0.30319" };
+            string[] dirs = new string[2] { "v2.0.50727", "v4.0.30319" };
             foreach (string frameworkDir in dirs)
             {
                 string path = rootPath + frameworkDir;

=== modified file 'MySql.Data/Provider/Source/common/MySqlTokenizer.cs'
--- a/MySql.Data/Provider/Source/common/MySqlTokenizer.cs	2010-04-27 18:31:24 +0000
+++ b/MySql.Data/Provider/Source/common/MySqlTokenizer.cs	2010-07-26 01:20:47 +0000
@@ -141,7 +141,7 @@
         {
             while (FindToken())
             {
-                string token = sql.Substring(startIndex, stopIndex - startIndex).Trim();
+                string token = sql.Substring(startIndex, stopIndex - startIndex);
                 return token;
             }
             return null;
@@ -223,6 +223,8 @@
             int startingIndex = pos-1;
 
             int index = sql.IndexOf(endingPattern, pos);
+            if (endingPattern == "\n")
+                index = sql.IndexOf('\n', pos);
             if (index == -1) 
                 index = sql.Length - 1;
             else 

=== modified file 'MySql.Data/Tests/Source/ConnectionTests.cs'
--- a/MySql.Data/Tests/Source/ConnectionTests.cs	2010-06-11 13:37:57 +0000
+++ b/MySql.Data/Tests/Source/ConnectionTests.cs	2010-07-26 01:20:47 +0000
@@ -485,7 +485,7 @@
         [Test]
         public void PingWhileReading()
         {
-            MySqlCommand command = new MySqlCommand("USE mysql; SELECT * FROM help_topic", conn);
+            MySqlCommand command = new MySqlCommand("SELECT 1", conn);
 
             using (MySqlDataReader reader = command.ExecuteReader())
             {

=== modified file 'MySql.Data/Tests/Source/PoolingTests.cs'
--- a/MySql.Data/Tests/Source/PoolingTests.cs	2010-06-25 21:46:56 +0000
+++ b/MySql.Data/Tests/Source/PoolingTests.cs	2010-07-26 01:20:47 +0000
@@ -162,6 +162,7 @@
             }
 		}
          
+#if !CF
         // Test that thread does not come to pool after abort
         [Test]
         public void TestAbort()
@@ -183,7 +184,7 @@
                 KillConnection(c1);
             }
         }
-
+#endif
 
 		/// <summary>
 		/// Bug #25614 After connection is closed, and opened again UTF-8 characters are not read well 
@@ -495,16 +496,22 @@
         {
             string connectionString = GetConnectionString(false);
             connectionString = connectionString.Replace("pooling=false", "pooling=true");
-            using (MySqlConnection c1 = new MySqlConnection(connectionString))
+
+            MySqlConnection c1 = new MySqlConnection(connectionString);
+            using (c1)
             {
                 c1.Open();
                 c1.Close();
             }
-            using (MySqlConnection c2 = new MySqlConnection(connectionString))
+
+            MySqlConnection c2 = new MySqlConnection(connectionString);
+            using (c2)
             {
                 c2.Open();
                 c2.Close();
             }
+
+            MySqlConnection.ClearAllPools();
         }
 
         /// <summary>

=== modified file 'MySql.Data/Tests/Source/Syntax2.cs'
--- a/MySql.Data/Tests/Source/Syntax2.cs	2009-07-28 20:40:35 +0000
+++ b/MySql.Data/Tests/Source/Syntax2.cs	2010-07-26 01:20:47 +0000
@@ -28,6 +28,11 @@
 	[TestFixture]
 	public class Syntax2 : BaseTest
 	{
+        public Syntax2()
+        {
+            csAdditions += ";logging=true;";
+        }
+
         [Test]
         public void CommentsInSQL()
         {

=== modified file 'MySql.Web/Providers/Source/Install.cs'
--- a/MySql.Web/Providers/Source/Install.cs	2010-07-20 19:53:09 +0000
+++ b/MySql.Web/Providers/Source/Install.cs	2010-07-26 01:20:47 +0000
@@ -90,7 +90,7 @@
 
         private void UpdateMachineConfigs(string rootPath, bool add)
         {
-            string[] dirs = new string[2] { "v2.0.50727", "4.0.30319" };
+            string[] dirs = new string[2] { "v2.0.50727", "v4.0.30319" };
             foreach (string frameworkDir in dirs)
             {
                 string path = rootPath + frameworkDir;


Attachment: [text/bzr-bundle] bzr/[e-mail]