Skip to content

Commit 543cba9

Browse files
committed
- Disable JDBC tests that fail on Linux
modified: storage/connect/mysql-test/connect/disabled.def - Typo modified: storage/connect/CMakeLists.txt
1 parent 72844d8 commit 543cba9

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

storage/connect/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,6 @@ ELSE()
242242
ENDIF()
243243

244244
IF(CONNECT_WITH_JDBC)
245-
# TODO: detect Java SDK and the presence of JDBC connectors
246-
# TODO: Find how to compile and install the java wrapper class
247-
# Find required libraries and include directories
248-
249245
FIND_PACKAGE(Java 1.6)
250246
FIND_PACKAGE(JNI)
251247
IF (JAVA_FOUND AND JNI_FOUND)
@@ -257,8 +253,8 @@ IF(CONNECT_WITH_JDBC)
257253
jdbconn.cpp tabjdbc.cpp jdbconn.h tabjdbc.h jdbccat.h
258254
JdbcInterface.java ApacheInterface.java MariadbInterface.java
259255
MysqlInterface.java OracleInterface.java PostgresqlInterface.java)
260-
# TODO: detect presence of components such as the MariaDB JDBC driver or
261-
# Apache package in order to add more files to the JAVA_SOURCES.
256+
# TODO: Find how to compile and install the java wrapper classes
257+
# Find required libraries and include directories
262258
SET (JAVA_SOURCES JdbcInterface.java)
263259
add_jar(JdbcInterface ${JAVA_SOURCES})
264260
install_jar(JdbcInterface DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)

storage/connect/mysql-test/connect/disabled.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
##############################################################################
1212
#json_udf_bin : broken upstream in --ps (fixed)
13-
#jdbc : Variable settings depend on machine configuration
14-
#jdbc_new : Variable settings depend on machine configuration
13+
jdbc : Variable settings depend on machine configuration
14+
jdbc_new : Variable settings depend on machine configuration
1515
jdbc_oracle : Variable settings depend on machine configuration
1616
jdbc_postgresql : Variable settings depend on machine configuration

0 commit comments

Comments
 (0)