bzr commit into connector-net-6.0 branch (reggie.burnett:853)

[Reggie Burnett]

#At file:///C:/Documents%20and%20Settings/Reggie/work/connector-net/6.0/ based on revid:reggie.burnett@stripped

  853 Reggie Burnett	2010-12-14
      backporting a couple of changes from 6.1

    modified:
      MySql.Data/Provider/Source/datareader.cs
      MySql.Data/Tests/Source/CommandTests.cs
=== modified file 'MySql.Data/Provider/Source/datareader.cs'
=== modified file 'MySql.Data/Provider/Source/datareader.cs'
--- a/MySql.Data/Provider/Source/datareader.cs	2010-12-14 14:56:49 +0000
+++ b/MySql.Data/Provider/Source/datareader.cs	2010-12-14 15:17:51 +0000
@@ -958,7 +958,7 @@
                     throw new MySqlException(Resources.Timeout);
                 if (ex.Number == 0)
                     throw new MySqlException(Resources.FatalErrorReadingResult, ex);
-                if ((Behavior & CommandBehavior.CloseConnection) != 0)
+                if ((commandBehavior & CommandBehavior.CloseConnection) != 0)
                     Close();
                 throw;
             }

=== modified file 'MySql.Data/Tests/Source/CommandTests.cs'
--- a/MySql.Data/Tests/Source/CommandTests.cs	2010-12-14 14:56:49 +0000
+++ b/MySql.Data/Tests/Source/CommandTests.cs	2010-12-14 15:17:51 +0000
@@ -457,7 +457,7 @@
                 try
                 {
                     cmd.ExecuteReader(CommandBehavior.CloseConnection);
-                    Assert.Fail();
+                    Assert.Fail("This should have failed");
                 }
                 catch (MySqlException)
                 {


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