Merge branch 'wl15481' into trunk

Change-Id: I1713889ccd7bc150bab16aece6f5295fd41f6f5e

Author: silvakid

jdbc/cppconn/connection.h

@@ -137,6 +137,7 @@
 #define OPT_OCI_CONFIG_FILE "OPT_OCI_CONFIG_FILE"
 #define OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE \
   "OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE"
+#define OPT_OCI_CLIENT_CONFIG_PROFILE "OPT_OCI_CLIENT_CONFIG_PROFILE"
 
 namespace sql
 {

jdbc/driver/mysql_connection.cpp

@@ -1029,6 +1029,24 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
           OPT_OCI_CONFIG_FILE
         );
       }
+    } else if (!it->first.compare(OPT_OCI_CLIENT_CONFIG_PROFILE)) {
+      try {
+        p_s = (it->second).get<sql::SQLString>();
+      } catch (sql::InvalidArgumentException &) {
+        throw sql::InvalidArgumentException(
+            "Wrong type passed for OPT_OCI_CLIENT_CONFIG_PROFILE. Expected "
+            "sql::SQLString.");
+      }
+
+      try {
+        proxy->plugin_option(MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+                             "authentication_oci_client",
+                             "authentication-oci-client-config-profile", *p_s);
+      } catch (sql::InvalidArgumentException &e) {
+        throw ::sql::SQLUnsupportedOptionException(
+            "Failed to set config profile for authentication_oci_client plugin",
+            OPT_OCI_CLIENT_CONFIG_PROFILE);
+      }
 
     } else if (!it->first.compare(OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE)) {
 #if defined(_WIN32)