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

[Reggie Burnett]

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

  886 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-25 17:03:30 +0000
+++ b/CHANGES	2010-06-25 17:47:41 +0000
@@ -1,4 +1,3 @@
-Version 6.3.3 (beta 2)
 - Fix race condition (concurrent reading/modification of the same DataSet) in StoredProcedure.GetParameters()
   (bug#49118)
 - Fix problems with MySqlDataAdapter insert command, when batch size is > 1, and 
@@ -9,6 +8,7 @@
   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)
 - changed installer code to skip over config folders that do not contain a machine.config (bug #52352)
+- added public MySqlHelper.ExecuteDataReader method that takes an external connection (bug #54570)
 
 Version 6.3.2 (beta 1)
 - added feature where sql queries that are longer than 300 chars are normalized and a new

=== 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]