bzr commit into connector-net-6.1 branch (reggie.burnett:819)

[Reggie Burnett]

#At file:///C:/work/bzr-connector-net/6.1/ based on revid:iggy@stripped

  819 Reggie Burnett	2010-06-25 [merge]
      merged

    modified:
      CHANGES
      MySql.Data/Provider/Source/MySqlHelper.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-06-22 11:44:48 +0000
+++ b/CHANGES	2010-06-25 17:41:42 +0000
@@ -3,8 +3,9 @@
 - Fix problems with MySqlDataAdapter insert command, when batch size is > 1, and 
   INSERT statement has expression with parentheses (e.g arithmetical expressions) (bug #54386)
 - When command is killed, e.g as result of timeout, error code returned from server 
-is not necessarily 1317 (QueryInterrupted). It might as well be 1028 (FileSortAborted).
-Fix timeout handling to handle both error codes in the same fashion (bug #53357)
+  is not necessarily 1317 (QueryInterrupted). It might as well be 1028 (FileSortAborted).
+  Fix timeout handling to handle both error codes in the same fashion (bug #53357)
+- added public MySqlHelper.ExecuteDataReader method that takes an external connection (bug #54570)
 
 Version 6.1.4
 - SessionProvider : Avoid SQLNullValueException if lockId returned by select is 

=== modified file 'MySql.Data/Provider/Source/MySqlHelper.cs'
--- a/MySql.Data/Provider/Source/MySqlHelper.cs	2009-11-10 22:37:01 +0000
+++ b/MySql.Data/Provider/Source/MySqlHelper.cs	2010-06-25 17:41:42 +0000
@@ -263,6 +263,18 @@
 			return ExecuteReader(connectionString, commandText, (MySqlParameter[])null);
 		}
 
+        /// <summary>
+        /// Executes a single command against a MySQL database.
+        /// </summary>
+        /// <param name="connection"><see cref="MySqlConnection"/> object to use for the command</param>
+        /// <param name="commandText">Command text to use</param>
+        /// <returns><see cref="MySqlDataReader"/> object ready to read the results of the command</returns>
+        public static MySqlDataReader ExecuteReader(MySqlConnection connection, string commandText)
+        {
+            //pass through the call providing null for the set of SqlParameters
+            return ExecuteReader(connection, null, commandText, (MySqlParameter[])null, true);
+        }
+
 		/// <summary>
 		/// Executes a single command against a MySQL database.
 		/// </summary>


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