Merge branch 'bb-10.2-release' into 10.2

MariaDB · May 7, 2021 · c225eee · c225eee
2 parents 54d7ba9 + a20195b
commit c225eee
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/libmariadb b/libmariadb
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
@@ -274,10 +274,6 @@ IF(CONNECT_WITH_JDBC)
     Mongo2Interface.java Mongo3Interface.java
     JavaWrappers.jar)
     add_definitions(-DJAVA_SUPPORT)
-    IF(CONNECT_WITH_MONGO)
-      SET(CONNECT_SOURCES ${CONNECT_SOURCES} Mongo2.jar Mongo3.jar)
-      add_definitions(-DMONGO_SUPPORT)
-    ENDIF()
   ELSE()
     SET(JDBC_LIBRARY "")
   ENDIF()
@@ -411,11 +407,5 @@ IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
     ${CMAKE_CURRENT_SOURCE_DIR}/JavaWrappers.jar
     ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar
     DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
-  IF(CONNECT_WITH_MONGO)
-    INSTALL(FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/Mongo2.jar
-      ${CMAKE_CURRENT_SOURCE_DIR}/Mongo3.jar
-      DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
-  ENDIF()
 ENDIF()
 
diff --git a/storage/connect/Mongo2.jar b/storage/connect/Mongo2.jar
diff --git a/storage/connect/Mongo3.jar b/storage/connect/Mongo3.jar