Merge branch 'series/1.1' into jdbc

Author: silvakid

FindMySQL.cmake

@@ -700,8 +700,6 @@ endif()
 
 # For dynamic linking use the built-in sys and strings
 if(NOT MYSQLCLIENT_STATIC_LINKING)
-   list(APPEND SYS_LIBRARIES "mysql_sys")
-   list(APPEND SYS_LIBRARIES "mysql_strings")
    list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES})
    SET(MYSQL_LIBRARIES ${SYS_LIBRARIES})
 

driver/mysql_connection.cpp

@@ -258,8 +258,10 @@ static const String2IntMap intOptions[]=
     {"OPT_READ_TIMEOUT",        MYSQL_OPT_READ_TIMEOUT, false},
     {"OPT_WRITE_TIMEOUT",       MYSQL_OPT_WRITE_TIMEOUT, false},
     {"OPT_LOCAL_INFILE",        MYSQL_OPT_LOCAL_INFILE, false},
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
     {"OPT_MAX_ALLOWED_PACKET",  MYSQL_OPT_MAX_ALLOWED_PACKET, false},
     {"OPT_NET_BUFFER_LENGTH",   MYSQL_OPT_NET_BUFFER_LENGTH, false},
+#endif
     {"OPT_SSL_MODE",            MYSQL_OPT_SSL_MODE    , false},
 #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
     {"OPT_RETRY_COUNT",         MYSQL_OPT_RETRY_COUNT, false},
@@ -284,7 +286,9 @@ static const String2IntMap stringOptions[]=
     {"readDefaultGroup", MYSQL_READ_DEFAULT_GROUP, false},
     {"readDefaultFile",  MYSQL_READ_DEFAULT_FILE, false},
     {"OPT_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, true},
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
     {"OPT_TLS_VERSION",  MYSQL_OPT_TLS_VERSION, false},
+#endif
   };
 
 template<class T>
@@ -425,8 +429,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;

driver/nativeapi/mysql_native_connection_wrapper.cpp

@@ -93,10 +93,12 @@ get_mysql_option(sql::mysql::MySQL_Connection_Options opt)
   case sql::mysql::MYSQL_SERVER_PUBLIC_KEY: return ::MYSQL_SERVER_PUBLIC_KEY;
   case sql::mysql::MYSQL_ENABLE_CLEARTEXT_PLUGIN: return ::MYSQL_ENABLE_CLEARTEXT_PLUGIN;
   case sql::mysql::MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: return ::MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS;
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
   case sql::mysql::MYSQL_OPT_MAX_ALLOWED_PACKET: return ::MYSQL_OPT_MAX_ALLOWED_PACKET;
   case sql::mysql::MYSQL_OPT_NET_BUFFER_LENGTH: return ::MYSQL_OPT_NET_BUFFER_LENGTH;
   case sql::mysql::MYSQL_OPT_TLS_VERSION: return ::MYSQL_OPT_TLS_VERSION;
   case sql::mysql::MYSQL_OPT_SSL_MODE: return ::MYSQL_OPT_SSL_MODE;
+#endif
 
 
 #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
@@ -110,7 +112,9 @@ get_mysql_option(sql::mysql::MySQL_Connection_Options opt)
   case sql::mysql::MYSQL_OPT_GUESS_CONNECTION: return ::MYSQL_OPT_GUESS_CONNECTION;
   case sql::mysql::MYSQL_SET_CLIENT_IP: return ::MYSQL_SET_CLIENT_IP;
   case sql::mysql::MYSQL_SECURE_AUTH: return ::MYSQL_SECURE_AUTH;
+# if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
   case sql::mysql::MYSQL_OPT_SSL_ENFORCE: return ::MYSQL_OPT_SSL_ENFORCE;
+# endif
 #endif
 
   }

test/driver_test.cpp

@@ -84,7 +84,7 @@ static void driver_test_new_driver_exception()
   try {
     new sql::mysql::MySQL_Driver();
     ensure("Exception not thrown", false);
-  } catch (sql::InvalidArgumentException) { }
+  } catch (sql::InvalidArgumentException&) { }
 }
 
 /* {{{	*/

test/framework/framework.h

@@ -68,8 +68,8 @@
 #define TEST_CASE( methodName ) \
   RegisterTestCase( new TestCase<TestSuiteClass>( *this, &TestSuiteClass::methodName, #methodName ) )
 
-#define SKIP( message ) TestsListener::setTestExecutionComment( String("SKIP ") + message );\
-  return
+#define SKIP( message ) { TestsListener::setTestExecutionComment( String("SKIP ") + message );\
+  return; }
 
 #define TODO( message ) TestsListener::setTestExecutionComment( String("TODO ") + message ); throw TestFailedException();
 

test/static_test.cpp

@@ -61,7 +61,7 @@ static void driver_test_new_driver_exception()
   try {
 //		new sql::mysql::MySQL_Driver();
 //		ensure("Exception not thrown", false);
-  } catch (sql::InvalidArgumentException) { }
+  } catch (sql::InvalidArgumentException&) { }
 }
 
 

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);