Connector/NET commit: r1650 - in branches/6.0: . MySql.Data/Provider/Source MySql.Data/Tests/Source

[rburnett]

Modified:
   branches/6.0/CHANGES
   branches/6.0/MySql.Data/Provider/Source/Driver.cs
   branches/6.0/MySql.Data/Tests/Source/CommandTests.cs
Log:
- fixed bug where our internal driver was using a batched command even if the user had added
  'allow batch=false' to their connection string (bug #45502)


Modified: branches/6.0/CHANGES
===================================================================
--- branches/6.0/CHANGES	2009-06-15 21:08:04 UTC (rev 1649)
+++ branches/6.0/CHANGES	2009-06-16 16:23:20 UTC (rev 1650)
@@ -1,3 +1,7 @@
+Version 6.0.5
+- fixed bug where our internal driver was using a batched command even if the user had added
+  'allow batch=false' to their connection string (bug #45502)
+  
 Version 6.0.4
 - fixed regression where using stored procs with datasets (bug #44460)
 - fixed compilation under VS 2005 (bug #44822)

Modified: branches/6.0/MySql.Data/Provider/Source/Driver.cs
===================================================================
--- branches/6.0/MySql.Data/Provider/Source/Driver.cs	2009-06-15 21:08:04 UTC (rev 1649)
+++ branches/6.0/MySql.Data/Provider/Source/Driver.cs	2009-06-16 16:23:20 UTC (rev 1650)
@@ -263,7 +263,8 @@
                 if ((clientCharSet != null && clientCharSet.ToString() != charSet) ||
                     (connCharSet != null && connCharSet.ToString() != charSet))
                 {
-                    cmd.CommandText = "SET NAMES " + charSet + ";" + cmd.CommandText;
+                    MySqlCommand setNamesCmd = new MySqlCommand("SET NAMES " + charSet, connection);
+                    setNamesCmd.ExecuteNonQuery();
                 }
                 cmd.ExecuteNonQuery();
             }

Modified: branches/6.0/MySql.Data/Tests/Source/CommandTests.cs
===================================================================
--- branches/6.0/MySql.Data/Tests/Source/CommandTests.cs	2009-06-15 21:08:04 UTC (rev 1649)
+++ branches/6.0/MySql.Data/Tests/Source/CommandTests.cs	2009-06-16 16:23:20 UTC (rev 1650)
@@ -385,6 +385,21 @@
                 Assert.AreEqual(0, cmd.ExecuteNonQuery());
             }
         }
+
+        /// <summary>
+        /// Bug #45502 error if "Allow Batch=False" 
+        /// </summary>
+        [Test]
+        public void DontAllowBatching()
+        {
+            string connStr = GetConnectionString(true) + ";allow batch=false;character set=utf8";
+            using (MySqlConnection c = new MySqlConnection(connStr))
+            {
+                c.Open();
+                MySqlCommand cmd = new MySqlCommand("SELECT 1", c);
+                cmd.ExecuteScalar();
+            }
+        }
     }