database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

- Define MAX_CONNECT_LEN as 1024 following MSDN recommendation

Browse Source 
modified:   storage/connect/odbconn.h

- Remove java compiling of JdbcInterface that caused failed compile
  on BuildBot Labrador site
  modified:   storage/connect/CMakeLists.txt

- Remove unused define of MAX_CONNECT_LEN
  modified:   storage/connect/jdbconn.h
This commit is contained in:
Olivier Bertrand
2016-06-25 14:26:36 +02:00
parent d50acf9f88
commit 92dbe32ddb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/CMakeLists.txt
View File

@@ -246,7 +246,7 @@ IF(CONNECT_WITH_JDBC)
FIND_PACKAGE(Java)
FIND_PACKAGE(JNI)
IF (JAVA_FOUND AND JNI_FOUND)
INCLUDE(UseJava)
# INCLUDE(UseJava) failed compile on buildbot Labrador
INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH})
INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH2})
# SET(JDBC_LIBRARY ${JAVA_JVM_LIBRARY})
@@ -255,8 +255,8 @@ IF(CONNECT_WITH_JDBC)
JdbcDSInterface.java JdbcDSInterface.class
JdbcApacheInterface.java JdbcApacheInterface.class
jdbconn.cpp tabjdbc.cpp jdbconn.h tabjdbc.h jdbccat.h)
SET (JAVA_SOURCES JdbcInterface.java)
add_jar(JdbcInterface ${JAVA_SOURCES})
# SET (JAVA_SOURCES JdbcInterface.java)
# add_jar(JdbcInterface ${JAVA_SOURCES})
add_definitions(-DJDBC_SUPPORT)
ELSE()
SET(JDBC_LIBRARY "")

2
storage/connect/jdbconn.h
View File

@@ -24,7 +24,7 @@
//efine MAX_FNAME_LEN 256 // Max size of field names
//efine MAX_STRING_INFO 256 // Max size of string from SQLGetInfo
//efine MAX_DNAME_LEN 256 // Max size of Recordset names
#define MAX_CONNECT_LEN 512 // Max size of Connect string
//efine MAX_CONNECT_LEN 512 // Max size of Connect string
//efine MAX_CURSOR_NAME 18 // Max size of a cursor name
#define DEFAULT_FIELD_TYPE 0 // TYPE_NULL

2
storage/connect/odbconn.h
View File

@@ -25,7 +25,7 @@
//efine MAX_FNAME_LEN 256 // Max size of field names
#define MAX_STRING_INFO 256 // Max size of string from SQLGetInfo
//efine MAX_DNAME_LEN 256 // Max size of Recordset names
#define MAX_CONNECT_LEN 512 // Max size of Connect string
#define MAX_CONNECT_LEN 1024 // Max size of Connect string
//efine MAX_CURSOR_NAME 18 // Max size of a cursor name
#define DEFAULT_FIELD_TYPE SQL_TYPE_NULL // pick "C" data type to match SQL data type