Workaround for mysql_set_options() when fist it sends OPT_SSL_MODE and

then OPT_TLS_VERSION, since this will overwrite SSL_MODE to PREFERED.
Add UT to test if fails with wrong TLS version.

Author: silvakid

driver/mysql_connection.cpp

@@ -442,7 +442,7 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
 
 #define PROCESS_CONN_OPTION(option_type, options_map) process_connection_option< option_type >(it, options_map, sizeof(options_map)/sizeof(String2IntMap), proxy)
 
-  for (it = properties.begin(); it != properties.end(); ++it) {
+    for (it = properties.begin(); it != properties.end(); ++it) {
     if (!it->first.compare("userName")) {
       try {
         p_s = (it->second).get< sql::SQLString >();
@@ -762,6 +762,19 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
 
   } /* End of cycle on connection options map */
 
+
+  /*
+    Workaround for libmysqlclient... if OPT_TLS_VERSION is used, it overwrites
+    OPT_SSL_MODE... setting it again.
+  */
+
+  it = properties.find("OPT_SSL_MODE");
+
+  if (it != properties.end())
+  {
+     PROCESS_CONN_OPTION(int, intOptions);
+  }
+
 #undef PROCESS_CONNSTR_OPTION
 
   /* libmysql shouldn't think it is too smart */

test/unit/classes/connection.cpp

@@ -3032,7 +3032,7 @@ void connection::tls_version()
 
   std::string tls_available = res->getString(2);
 
-  con->isValid();
+  std::cout << "TLS VERSIONS: " <<tls_available << std::endl;
 
   std::vector<std::string> tls_versions;
 
@@ -3048,29 +3048,45 @@ void connection::tls_version()
 
   connection_properties["OPT_SSL_MODE"] = sql::SSL_MODE_REQUIRED;
 
+  // Using wrong TLS version... should fail to connect
+  connection_properties["OPT_TLS_VERSION"] = sql::SQLString("TLSv999");
+
+  created_objects.clear();
+  try
+  {
+    con.reset(driver->connect(connection_properties));
+    FAIL("Wrong TLS version used and still can connect!");
+  }
+  catch (sql::SQLException &e)
+  {
+    //Should FAIL to connect
+  }
+
+
   for (std::vector<std::string>::const_iterator version = tls_versions.begin();
        version != tls_versions.end();
        ++version)
   {
     connection_properties["OPT_TLS_VERSION"] = sql::SQLString(*version);
 
     created_objects.clear();
-    con.reset(driver->connect(connection_properties));
-
+    try
+    {
+      con.reset(driver->connect(connection_properties));
+    }
+    catch (sql::SQLException &e)
+    {
+      //Server exports TLS_VERSION even if no certs installed...
+      //So skipping anyway if error on connect
+      std::cout << "SKIP "<< *version << ": " << e.what() << std::endl;
+      continue;
+    }
 
     stmt.reset(con->createStatement());
     res.reset(stmt->executeQuery("SHOW SESSION STATUS LIKE 'Ssl_version'"));
 
     res->next();
 
-    //Workaround for failed UT on GPL
-    if (res->getString(2).length() == 0)
-    {
-      std::cout << "Skipping " << *version << std::endl;
-      continue;
-    }
-
-
     ASSERT_EQUALS(*version, res->getString(2));
   }