diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-10 09:09:50 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-10 09:09:50 +0300 |
| commit | 98e6159892ae36d4ab82ce8f43b7e7bc0ab6bfa2 (patch) | |
| tree | a9cd2b7610de5500583fe726a97fb8705bc6ccec /storage | |
| parent | 72753d2b65fe375d23954b877a48350adadeb4e4 (diff) | |
| parent | d0785f773188b5f0eebb3135b320b2bac628f2f2 (diff) | |
| download | mariadb-git-98e6159892ae36d4ab82ce8f43b7e7bc0ab6bfa2.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | storage/connect/JavaWrappers.jar | bin | 19192 -> 0 bytes | |||
| -rw-r--r-- | storage/connect/jsonudf.cpp | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 4df76095f02..2c8d0e07aa1 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -272,8 +272,14 @@ IF(CONNECT_WITH_JDBC) JdbcInterface.java ApacheInterface.java MariadbInterface.java MysqlInterface.java OracleInterface.java PostgresqlInterface.java Mongo2Interface.java Mongo3Interface.java - JavaWrappers.jar) + mysql-test/connect/std_data/JavaWrappers.jar) add_definitions(-DJAVA_SUPPORT) + IF(CONNECT_WITH_MONGO) + SET(CONNECT_SOURCES ${CONNECT_SOURCES} + mysql-test/connect/std_data/Mongo2.jar + mysql-test/connect/std_data/Mongo3.jar) + add_definitions(-DMONGO_SUPPORT) + ENDIF() ELSE() SET(JDBC_LIBRARY "") ENDIF() @@ -405,8 +411,13 @@ IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND) SET (JAVA_SOURCES JdbcInterface.java) add_jar(JdbcInterface ${JAVA_SOURCES}) INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/JavaWrappers.jar + ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/JavaWrappers.jar ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar DESTINATION ${INSTALL_PLUGINDIR} 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) + ENDIF() ENDIF() - diff --git a/storage/connect/JavaWrappers.jar b/storage/connect/JavaWrappers.jar Binary files differdeleted file mode 100644 index 33b29e7685b..00000000000 --- a/storage/connect/JavaWrappers.jar +++ /dev/null diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index c1eb81d3486..20694fd8b30 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -508,7 +508,7 @@ PVAL JSNX::GetCalcValue(PGLOBAL g, PJAR jap, int n) { // For calculated arrays, a local Value must be used int lng = 0; - short type, prec = 0; + short type= 0, prec= 0; bool b = n < Nod - 1; PVAL valp; PJVAL vlp, vp; |