bzr push into connector-net-trunk branch (vvaintroub:737 to 738)

[Vladislav Vaintroub]

  738 Vladislav Vaintroub	2009-09-26
      Fix wrong comment

    modified:
      MySql.Data/Provider/Source/datareader.cs
  737 Vladislav Vaintroub	2009-09-26
      Handle situation where ExecuteReader is called recursively, e.g to handle command behaviors.
      Only set timeout on top-level commands.
      
      Also, introduce timeout for Connection.SetDatabase() and Command.Prepare()
      Within TimedStream, check with assertion that all our IO calls are timed.

    modified:
      MySql.Data/Provider/Source/Connection.cs
      MySql.Data/Provider/Source/NativeDriver.cs
      MySql.Data/Provider/Source/TimedStream.cs
      MySql.Data/Provider/Source/command.cs
      MySql.Data/Provider/Source/common/NamedPipeStream.cs
      MySql.Data/Provider/Source/datareader.cs
      MySql.Data/Tests/Source/TimeoutAndCancel.cs
=== modified file 'MySql.Data/Provider/Source/datareader.cs'
--- a/MySql.Data/Provider/Source/datareader.cs	2009-09-26 12:32:55 +0000
+++ b/MySql.Data/Provider/Source/datareader.cs	2009-09-26 19:11:36 +0000
@@ -838,10 +838,7 @@ namespace MySql.Data.MySqlClient
             // single result means we only return a single resultset.  If we have already
             // returned one, then we return false;
             if (resultSet != null && (commandBehavior & CommandBehavior.SingleResult) != 0)
-            {
-                // Command is completed, clear the IO timeouts for the stream
                 return false;
-            }
 
 
             // next load up the next resultset if any


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