Merge remote-tracking branch 'remotes/origin/6.8' into 6.9

Author: Gabriela Martinez

CHANGES

@@ -3,6 +3,7 @@
 - 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)
 - Added support for TLSv1.1 and TLSv1.2
+- Fixed Fix for "Aborted connection" (MySQL Bug #80997, Oracle Bug # 23346197).
 
 
 6.9.8

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;
  internal bool isFabric;
 
  /// <summary>
@@ -540,15 +540,11 @@ 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);
  // if we are pooling, then release ourselves
  if (connectionString.Pooling)
@@ -563,7 +559,7 @@ protected virtual void Dispose(bool disposing)
  {
  reader = null;
  isOpen = false;
- disposeInProgress = false;
+ disposed = true;
  }
  }
 

Tests/MySql.Data.Tests/GetSchemaTests.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 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 
@@ -279,7 +279,7 @@ public void CanGetSchemaInformationGeneratedColumns()
  if (st.Version.Major >= 5 && st.Version.Minor >= 7 && st.Version.Build >= 6)
  {
  Assert.Equal("char", dt.Rows[2]["DATA_TYPE"]);
- Assert.Equal("Name", dt.Rows[2]["GENERATION_EXPRESSION"]);
+ Assert.Equal("Name", (dt.Rows[2]["GENERATION_EXPRESSION"]).ToString().Replace("`",""));
  Assert.Equal("STORED GENERATED", dt.Rows[2]["EXTRA"]); 
  }
  }

Tests/MySql.Data.Tests/MySqlConnectionTests.cs

@@ -1342,5 +1342,44 @@ 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();
+ var cmd = new MySqlCommand("show global status like 'aborted_clients'", con);
+ MySqlDataReader r = cmd.ExecuteReader();
+ r.Read();
+ int numClientsAborted = r.GetInt32(1);
+ r.Close();
+
+ 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);
+ }
+ 
+ r = cmd.ExecuteReader();
+ r.Read();
+ int numClientsAborted2 = r.GetInt32(1);
+ r.Close(); 
+ Assert.Equal(numClientsAborted, numClientsAborted);
+ con.Close();
+ }
  }
 }

Tests/MySql.Data.Tests/TimeoutAndCancel.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 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 
@@ -269,17 +269,14 @@ public void ConnectionStringModifiedAfterCancel()
  return;
 
  connStr = connStr.Replace("persist security info=true", "persist security info=false");
-
- int threadId;
+ 
  using (MySqlConnection c = new MySqlConnection(connStr))
  {
- c.Open();
- threadId = c.ServerThread;
+ c.Open(); 
  string connStr1 = c.ConnectionString;
 
  MySqlCommand cmd = new MySqlCommand("SELECT SLEEP(5)", c);
  cmd.CommandTimeout = 1;
-
  try
  {
  using (MySqlDataReader reader = cmd.ExecuteReader())
@@ -293,8 +290,9 @@ public void ConnectionStringModifiedAfterCancel()
  }
  string connStr2 = c.ConnectionString.ToLower(CultureInfo.InvariantCulture);
  Assert.Equal(connStr1.ToLower(CultureInfo.InvariantCulture), connStr2);
+ c.Close(); 
  }
-  st.execSQL("kill " + threadId);
+ 
  }