Bug #28204677: Connector charset default utf8mb4

Author: silvakid

driver/mysql_connection.cpp

@@ -425,8 +425,8 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
 
   sql::SQLString userName;
   sql::SQLString password;
-  sql::SQLString defaultCharset("utf8");
-  sql::SQLString characterSetResults("utf8");
+  sql::SQLString defaultCharset("utf8mb4");
+  sql::SQLString characterSetResults("utf8mb4");
 
   sql::SQLString sslKey, sslCert, sslCA, sslCAPath, sslCipher, postInit;
   bool ssl_used = false;

test/unit/bugs/bugs.cpp

@@ -493,9 +493,6 @@ void bugs::bug71606()
 {
   logMsg("bugs::bug71606");
 
-  //TODO: Enable it after fixing
-  SKIP("Removed untill fixed");
-
   if (getMySQLVersion(con) < 56000)
   {
     SKIP("The server does not support tested functionality(utf8mb4 charset)");
@@ -1093,5 +1090,22 @@ void bugs::bug17227390()
   }
 }
 
+/* Bug #28204677 - The driver defaults to utf8mb4 */
+void bugs::bug28204677()
+{
+  logMsg("bugs::bug71606");
+
+  if (getMySQLVersion(con) < 57000)
+  {
+    SKIP("The server does not support tested functionality(default utf8mb4 charset)");
+  }
+
+  res.reset(stmt->executeQuery("SHOW VARIABLES like 'character_set_client'"));
+  res->next();
+
+  ASSERT_EQUALS(res->getString(2),"utf8mb4");
+}
+
 } /* namespace regression */
 } /* namespace testsuite */
+

test/unit/bugs/bugs.h

@@ -137,6 +137,8 @@ class bugs : public unit_fixture
 
   void bug17227390();
 
+  void bug28204677();
+
 };
 
 REGISTER_FIXTURE(bugs);