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

[Reggie Burnett]

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

  936 Reggie Burnett	2010-10-11 [merge]
      merge

    modified:
      CHANGES
      MySql.Data/Provider/Source/command.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-10-07 22:00:39 +0000
+++ b/CHANGES	2010-10-11 18:29:42 +0000
@@ -1,15 +1,14 @@
 - Fix installer bug related to .NET FW 4.0 (bug #56580)
 - Added MySqlHelper.ExecuteReader that takes an external connection and array of paramters (bug #56755)
 - fixed database methods in EF4 provider services to use the database name from the connection string (bug #56589)
-- fixed problem with using bit parameters as output (bug #56756)
+- fixed problem with using bit parameters as output (bug #56756)
 - Handle MySqlCommand.CommandTimeout = 0 properly (Bug #57265)
 - Do not call AcceptChanged on tables in MySqlDataAdapter.Update(),
   but on individual rows (Bug #57092)
-  
-Version 6.3.4
-- fixed problem with using bit parameters as output (bug #56756)
 - fixed MySqlCommand.Clone so that the default command timeoout functionality is not disabled when
   you clone a command (bug #56806)
+
+Version 6.3.4
 - Fix authorization popup after modifying stored procedure in VS (Bug #44715)
 - Dispose EventLog after use in MySql.Web.dll provider classes, to avoid wasting resources
   (Bug #55793)

=== modified file 'MySql.Data/Provider/Source/command.cs'
--- a/MySql.Data/Provider/Source/command.cs	2010-10-07 22:00:07 +0000
+++ b/MySql.Data/Provider/Source/command.cs	2010-10-11 18:30:02 +0000
@@ -793,6 +793,7 @@
 			MySqlCommand clone = new MySqlCommand(cmdText, connection, curTransaction);
             clone.CommandType = CommandType;
             clone.commandTimeout = commandTimeout;
+            clone.useDefaultTimeout = useDefaultTimeout;
             clone.batchableCommandText = batchableCommandText;
             clone.UpdatedRowSource = UpdatedRowSource;
 


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