mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
bcfb5b2de9
modified: storage/connect/ha_connect.cc - Include MONGO in all Java enabled distributions Mongo will be enabled only for 10.2 and 10.3 modified: storage/connect/CMakeLists.txt - Change JDBC_SUPPORT to JAVA_SUPPORT which also replaces MONGO_SUPPORT MONGO_SUPPORT is now just used to enable the MONGO table type modified: storage/connect/filter.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/mongo.cpp modified: storage/connect/mycat.cc modified: storage/connect/plgdbutl.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Move MakeSelector function from FILTER to mongo.cpp modified: storage/connect/filter.cpp modified: storage/connect/filter.h modified: storage/connect/cmgoconn.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/mongo.cpp - Do mongo_init only on first use of the MongoDB C Driver This will permit to delay load the mongo lib on Windows modified: storage/connect/cmgoconn.cpp modified: storage/connect/cmgoconn.h modified: storage/connect/ha_connect.cc - Replace NEW_VAR by a test on MYSQL_VERSION_ID modified: storage/connect/ha_connect.cc - Suppress enable_mongo session variable modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc - Make some function headers identical in .h and .cc file (replacing const char* by PCSZ) modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - Change a parameter type from uchar* to const uchar* (for ScanRecord and CheckRecord) modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - Changes on LIKE and NOT LIKE does not fix a bug yet modified: storage/connect/ha_connect.cc - Suppress PIVOT_SUPPORT (PIVOT type is unconditionnal) modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc - Change the strz function from inline to static modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - export the JavaConn class and the MgoColumns and IsNum functions modified: storage/connect/javaconn.h modified: storage/connect/json.h modified: storage/connect/mongo.h - Fix MDEV-13924 modified: storage/connect/jdbconn.cpp - Make a temporary fix for the compiler bug in CalculateArray modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp - Typo modified: storage/connect/jdbccat.h modified: storage/connect/reldef.h modified: storage/connect/tabext.h modified: storage/connect/tabjmg.cpp modified: storage/connect/tabxml.h modified: storage/connect/valblk.h modified: storage/connect/value.h modified: storage/connect/xtable.h - Fix a bug in MONGO tests by changing 'MONGO' to $TYPE modified: storage/connect/mysql-test/connect/t/mongo_test.inc - Record test results to reflect all changes modified: storage/connect/mysql-test/connect/r/json_java_2.result modified: storage/connect/mysql-test/connect/r/json_java_3.result modified: storage/connect/mysql-test/connect/r/json_mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_java_2.result modified: storage/connect/mysql-test/connect/r/mongo_java_3.result
35 lines
1.4 KiB
C
35 lines
1.4 KiB
C
#ifndef __JDBCCAT_H
|
|
#define __JDBCCAT_H
|
|
|
|
// Timeout and net wait defaults
|
|
#define DEFAULT_LOGIN_TIMEOUT -1 // means do not set
|
|
#define DEFAULT_QUERY_TIMEOUT -1 // means do not set
|
|
|
|
typedef struct jdbc_parms {
|
|
int CheckSize(int rows);
|
|
PCSZ Driver; // JDBC driver
|
|
PCSZ Url; // Driver URL
|
|
PCSZ User; // User connect info
|
|
PCSZ Pwd; // Password connect info
|
|
//int Cto; // Connect timeout
|
|
//int Qto; // Query timeout
|
|
int Version; // Driver version
|
|
int Fsize; // Fetch size
|
|
bool Scrollable; // Scrollable cursor
|
|
} JDBCPARM, *PJPARM;
|
|
|
|
/***********************************************************************/
|
|
/* JDBC catalog function prototypes. */
|
|
/***********************************************************************/
|
|
#if defined(PROMPT_OK)
|
|
char *JDBCCheckConnection(PGLOBAL g, PCSZ dsn, int cop);
|
|
#endif // PROMPT_OK
|
|
//PQRYRES JDBCDataSources(PGLOBAL g, int maxres, bool info);
|
|
PQRYRES JDBCColumns(PGLOBAL g, PCSZ db, PCSZ table,
|
|
PCSZ colpat, int maxres, bool info, PJPARM sop);
|
|
PQRYRES JDBCSrcCols(PGLOBAL g, PCSZ src, PJPARM sop);
|
|
PQRYRES JDBCTables(PGLOBAL g, PCSZ db, PCSZ tabpat,
|
|
PCSZ tabtyp, int maxres, bool info, PJPARM sop);
|
|
PQRYRES JDBCDrivers(PGLOBAL g, int maxres, bool info);
|
|
|
|
#endif // __JDBCCAT_H
|