CONNECT: move jar files to /usr/share and include them in DEBs

MariaDB · May 22, 2021 · d732189 · d732189
1 parent 9d0fde3
commit d732189
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/debian/mariadb-plugin-connect.install b/debian/mariadb-plugin-connect.install
@@ -1,2 +1,6 @@
 etc/mysql/conf.d/connect.cnf
 usr/lib/mysql/plugin/ha_connect.so
+usr/share/mysql/Mongo2.jar
+usr/share/mysql/Mongo3.jar
+usr/share/mysql/JavaWrappers.jar
+usr/share/mysql/JdbcInterface.jar
diff --git a/sql/mysqld.h b/sql/mysqld.h
@@ -536,7 +536,7 @@ extern ulonglong my_pcre_frame_size;
  */
 extern my_bool opt_large_pages;
 extern uint opt_large_page_size;
-extern char lc_messages_dir[FN_REFLEN];
+extern MYSQL_PLUGIN_IMPORT char lc_messages_dir[FN_REFLEN];
 extern char *lc_messages_dir_ptr, *log_error_file_ptr;
 extern MYSQL_PLUGIN_IMPORT char reg_ext[FN_EXTLEN];
 extern MYSQL_PLUGIN_IMPORT uint reg_ext_length;

diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
@@ -412,11 +412,11 @@ IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
   INSTALL(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/JavaWrappers.jar
     ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar
-    DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
+    DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT connect-engine)
   IF(CONNECT_WITH_MONGO)
     INSTALL(FILES
       ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/Mongo2.jar
       ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/Mongo3.jar
-      DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
+      DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT connect-engine)
   ENDIF()
 ENDIF()
diff --git a/storage/connect/javaconn.cpp b/storage/connect/javaconn.cpp
@@ -57,8 +57,8 @@ extern "C" HINSTANCE s_hModule;           // Saved module handle
 extern char *JvmPath;   // The connect_jvm_path global variable value
 extern char *ClassPath; // The connect_class_path global variable value
 
-char *GetPluginDir(void);
 char *GetJavaWrapper(void);		// The connect_java_wrapper variable value
+extern MYSQL_PLUGIN_IMPORT char lc_messages_dir[FN_REFLEN];
 
 /***********************************************************************/
 /*  Static JAVAConn objects.                                           */
@@ -401,23 +401,23 @@ bool JAVAConn::Open(PGLOBAL g)
 		}	// endif ClassPath
 
 #if 0
-		// Java source will be compiled as a jar file installed in the plugin dir
+		// Java source will be compiled as a jar file installed in the mysql share dir
 		jpop->Append(sep);
-		jpop->Append(GetPluginDir());
+		jpop->Append(lc_messages_dir);
 		jpop->Append("JdbcInterface.jar");
 #endif // 0
 
-		// All wrappers are pre-compiled in JavaWrappers.jar in the plugin dir
+		// All wrappers are pre-compiled in JavaWrappers.jar in the mysql share dir
 		jpop->Append(sep);
-		jpop->Append(GetPluginDir());
+		jpop->Append(lc_messages_dir);
 		jpop->Append("JavaWrappers.jar");
 
 #if defined(MONGO_SUPPORT)
 		jpop->Append(sep);
-		jpop->Append(GetPluginDir());
+		jpop->Append(lc_messages_dir);
 		jpop->Append("Mongo3.jar");
 		jpop->Append(sep);
-		jpop->Append(GetPluginDir());
+		jpop->Append(lc_messages_dir);
 		jpop->Append("Mongo2.jar");
 #endif   // MONGO_SUPPORT