diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-07-11 15:22:30 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-07-11 15:22:30 +0200 |
| commit | 8388ae6c006fc9d890aa146912ff00ce63e01208 (patch) | |
| tree | 2e83150592335d4f3fc5556c636e851317eeaded /storage/connect/CMakeLists.txt | |
| parent | fca92ced7375618d90c05fd9591d122097c9d38c (diff) | |
| download | mariadb-git-8388ae6c006fc9d890aa146912ff00ce63e01208.tar.gz | |
- Try distributing the JdbcInterface.jar
${INSTALL_PLUGIN_DIR} --> ${INSTALL_PLUGINDIR}
modified: storage/connect/CMakeLists.txt
- Try several paths when looking for JVM lib
modified: storage/connect/jdbconn.cpp
- Make Jdbc tests running on Windows and Linux
modified: storage/connect/mysql-test/connect/r/jdbc.result
modified: storage/connect/mysql-test/connect/r/jdbc_new.result
modified: storage/connect/mysql-test/connect/t/jdbc.test
modified: storage/connect/mysql-test/connect/t/jdbc_new.test
- Fix compiler's warnings
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jsonudf.cpp
Diffstat (limited to 'storage/connect/CMakeLists.txt')
| -rw-r--r-- | storage/connect/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 5eca74c9c23..ad11e87660a 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -253,7 +253,7 @@ IF(CONNECT_WITH_JDBC) MysqlInterface.java OracleInterface.java PostgresqlInterface.java) SET (JAVA_SOURCES JdbcInterface.java) add_jar(JdbcInterface ${JAVA_SOURCES}) -# install_jar(JdbcInterface ${INSTALL_PLUGIN_DIR} COMPONENT CONNECT) + install_jar(JdbcInterface ${INSTALL_PLUGINDIR} COMPONENT CONNECT) add_definitions(-DJDBC_SUPPORT) ELSE() SET(JDBC_LIBRARY "") |