Fixed Bug Fix for "Aborted connection" (MySQL Bug #80997, Oracle Bug # 23346197)

Author: Gabriela Martinez

CHANGES

@@ -2,6 +2,7 @@
 - Fix for Nested transactions are not supported in Entity Framework (MySQL Bug #71502, Oracle Bug #22366266).
 - Fix for EF5 and EF6 wrong SQL statement to set primary key (MySQL Bug 76292, Oracle Bug #20711384) 
 - Fixed problem where mysql.proc tables would not be used for metadata even though access was available (MySQL Bug #74116, Oracle Bug #20960373)
+- Fixed Fix for "Aborted connection" (MySQL Bug #80997, Oracle Bug # 23346197).
 
 6.8.7
 - Changed handshake process to use bytes instead of encoded strings.

Source/MySql.Data/Driver.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2004, 2016, Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -58,7 +58,7 @@ internal class Driver : IDisposable
  private bool firstResult;
  protected IDriver handler;
  internal MySqlDataReader reader;
- private bool disposeInProgress;
+ private bool disposed;
 
  /// <summary>
  /// For pooled connections, time when the driver was
@@ -532,20 +532,16 @@ public virtual void CloseQuery(MySqlConnection connection, int statementId)
  protected virtual void Dispose(bool disposing)
  {
  // Avoid cyclic calls to Dispose.
- if (disposeInProgress)
+ if (disposed)
  return;
-
- disposeInProgress = true;
-
  try
  {
- ResetTimeout(1000);
- if (disposing)
- handler.Close(isOpen);
+ ResetTimeout(1000); 
+ handler.Close(isOpen); 
  // if we are pooling, then release ourselves
  if (connectionString.Pooling)
-  MySqlPoolManager.RemoveConnection(this);
-  }
+ MySqlPoolManager.RemoveConnection(this); 
+ }
  catch (Exception)
  {
  if (disposing)
@@ -555,7 +551,7 @@ protected virtual void Dispose(bool disposing)
  {
  reader = null;
  isOpen = false;
- disposeInProgress = false;
+ disposed = true;
  }
  }
 

Tests/MySql.Data.Tests/MySqlConnectionTests.cs

@@ -1361,5 +1361,42 @@ public void SslOverrided()
  }
  }
  }
+
+
+
+ /// <summary>
+ /// Fix for aborted connections MySQL bug 80997 OraBug 23346197
+ /// </summary>
+ [Fact]
+ public void MarkConnectionAsClosedProperlyWhenDisposing()
+ {
+ MySqlConnection con = new MySqlConnection(st.GetConnectionString(true));
+ con.Open();
+ MySqlCommand cmd = new MySqlCommand() { Connection = con };
+ cmd.CommandText = "Flush status"; // reset values
+ cmd.ExecuteNonQuery();
+
+ AppDomain appDomain = FullTrustSandbox.CreateFullTrustDomain();
+ FullTrustSandbox sandbox = (FullTrustSandbox)appDomain.CreateInstanceAndUnwrap(
+ typeof(FullTrustSandbox).Assembly.FullName,
+ typeof(FullTrustSandbox).FullName);
+ try
+ {
+ MySqlConnection connection = sandbox.TryOpenConnection("server=localhost;userid=root;pwd=;port=3305");
+ Assert.NotNull(connection);
+ Assert.True(connection.State == ConnectionState.Open);
+ }
+ finally
+ {
+ AppDomain.Unload(appDomain);
+ }
+ cmd = new MySqlCommand("show global status like 'aborted_clients'", con); 
+ MySqlDataReader r = cmd.ExecuteReader();
+ r.Read();
+ int numClientsAborted = r.GetInt32(1);
+ r.Close(); 
+ Assert.Equal(0, numClientsAborted);
+ con.Close();
+ }
  }
 }