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

Author: Gabriela Martinez

Tests/MySql.Data.Tests/CharacterSetTests.cs

@@ -91,7 +91,6 @@ public void Latin1Connection()
    [Fact]
     public void GetSchemaOnUTF8()
     {
-      if (st.Version.Major >= 6) return;
 
       st.execSQL("CREATE TABLE Test(name VARCHAR(40) NOT NULL, name2 VARCHAR(20)) " +
         "CHARACTER SET utf8");
@@ -109,6 +108,8 @@ public void GetSchemaOnUTF8()
    [Fact]
     public void UTF8BlogsTruncating()
     {
+
+      st.execSQL("DROP TABLE IF EXISTS test");
       st.execSQL("CREATE TABLE test (name LONGTEXT) CHARSET utf8");
 
       string szParam = "test:éàçùêû";

Tests/MySql.Data.Tests/SetUp.cs

@@ -181,9 +181,9 @@ protected void LoadBaseConfiguration()
             else
                 port = int.Parse(portString);
             if (string.IsNullOrEmpty(pipeName))
-              pipeName = string.Format("MySQL{0}", Version.ToString().Substring(0, 3).Replace(".", ""));
+              pipeName = "MySQLSocket";
             if (string.IsNullOrEmpty(memoryName))
-              memoryName = string.Format("MySQL{0}", Version.ToString().Substring(0, 3).Replace(".", ""));
+              memoryName = "MySQLSocket";
 
         }