WL13884: Stage 2

Bogdan Degtyariov · Bogdan Degtyariov · commit f9f8221ec0aa · 2020-06-26T20:25:37.000+10:00
diff --git a/cppconn/connection.h b/cppconn/connection.h
@@ -60,7 +60,7 @@
 #define OPT_INIT_COMMAND "preInit"
 #define OPT_POST_INIT_COMMAND "postInit"
 #define OPT_LOCAL_INFILE "OPT_LOCAL_INFILE"
-#define OPT_ALLOW_LOAD_DATA_LOCAL_PATH "OPT_ALLOW_LOAD_DATA_LOCAL_PATH"
+#define OPT_LOAD_DATA_LOCAL_DIR "OPT_LOAD_DATA_LOCAL_DIR"
 
 /*
  SSL related
diff --git a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
@@ -303,7 +303,7 @@ static const String2IntMap stringOptions[]=
 #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
     {OPT_TLS_VERSION,          MYSQL_OPT_TLS_VERSION, false},
 #endif
-    {OPT_ALLOW_LOAD_DATA_LOCAL_PATH, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}
+    {OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false}
   };
 
 
@@ -1717,6 +1717,9 @@ MySQL_Connection::setClientOption(const sql::SQLString & optionName, const void
 #else
     throw MethodNotImplementedException("MySQL_Prepared_Statement::setResultSetType");
 #endif
+  } else if (!optionName.compare(OPT_LOAD_DATA_LOCAL_DIR))
+  {
+    proxy->options(MYSQL_OPT_LOAD_DATA_LOCAL_DIR, optionValue);
   }
   return this;
 }
diff --git a/test/unit/classes/CMakeLists.txt b/test/unit/classes/CMakeLists.txt
@@ -280,7 +280,7 @@ SET(test_uri_sources
 IF(WIN32)
   SET(test_uri_sources
         ${test_uri_sources}
-    "${CMAKE_SOURCE_DIR}/driver/mysql_uri.h"
+    "${CMAKE_SOURCE_DIR}/jdbc/driver/mysql_uri.h"
     uri.h)
 ENDIF(WIN32)
 
diff --git a/test/unit/classes/connection.cpp b/test/unit/classes/connection.cpp
