1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'connect/10.3' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin 2022-08-02 10:23:53 +02:00
commit 5ac528a91f
7 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
storage/connect/CMakeLists.txt
View File

@ -383,7 +383,7 @@ IF(CONNECT_WITH_REST)
# add_definitions(-DREST_SOURCE) # add_definitions(-DREST_SOURCE)
## ENDIF() ## ENDIF()
## ELSE(NOT cpprestsdk_FOUND) ## ELSE(NOT cpprestsdk_FOUND)
## MESSAGE(STATUS "=====> cpprestsdk package not found") # MESSAGE(STATUS "=====> cpprestsdk package not found")
# ENDIF (cpprestsdk_FOUND) # ENDIF (cpprestsdk_FOUND)
ENDIF(CONNECT_WITH_REST) ENDIF(CONNECT_WITH_REST)
ADD_FEATURE_INFO(CONNECT_REST CONNECT_WITH_REST "Support for REST API in the CONNECT storage engine") ADD_FEATURE_INFO(CONNECT_REST CONNECT_WITH_REST "Support for REST API in the CONNECT storage engine")
@ -414,28 +414,22 @@ IF(NOT TARGET connect)
RETURN() RETURN()
ENDIF() ENDIF()
IF(WIN32) IF(MSVC)
IF (libmongoc-1.0_FOUND) IF (libmongoc-1.0_FOUND)
SET_TARGET_PROPERTIES(connect PROPERTIES LINK_FLAGS SET_TARGET_PROPERTIES(connect PROPERTIES LINK_FLAGS
"/DELAYLOAD:libbson-1.0.dll /DELAYLOAD:libmongoc-1.0.dll") "/DELAYLOAD:libbson-1.0.dll /DELAYLOAD:libmongoc-1.0.dll")
ENDIF(libmongoc-1.0_FOUND) ENDIF()
# Temporarily disable "conversion from size_t .." warnings
# Install some extra files that belong to connect engine
INSTALL(FILES "$<TARGET_FILE_DIR:connect>/ha_connect.lib"
DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
ENDIF(WIN32)
IF(MSVC)
# Temporarily disable "conversion from size_t .."
IF(CMAKE_SIZEOF_VOID_P EQUAL 8) IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267")
ENDIF() ENDIF()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
string(REPLACE "/permissive-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REPLACE "/permissive-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
INSTALL(FILES "$<TARGET_FILE_DIR:connect>/ha_connect.lib"
DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
ENDIF() ENDIF()
IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND) IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
# TODO: Find how to compile and install the java wrapper classes # TODO: Find how to compile and install the java wrapper classes
# Find required libraries and include directories # Find required libraries and include directories

4
storage/connect/ha_connect.cc
View File

@ -266,7 +266,7 @@ bool Force_Bson(void);
size_t GetWorkSize(void); size_t GetWorkSize(void);
void SetWorkSize(size_t); void SetWorkSize(size_t);
extern "C" const char *msglang(void); extern "C" const char *msglang(void);
static char *strz(PGLOBAL g, LEX_CSTRING &ls);
static void PopUser(PCONNECT xp); static void PopUser(PCONNECT xp);
static PCONNECT GetUser(THD *thd, PCONNECT xp); static PCONNECT GetUser(THD *thd, PCONNECT xp);
static PGLOBAL GetPlug(THD *thd, PCONNECT& lxp); static PGLOBAL GetPlug(THD *thd, PCONNECT& lxp);
@ -5957,7 +5957,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
#if defined(REST_SUPPORT) #if defined(REST_SUPPORT)
case TAB_REST: case TAB_REST:
if (!topt->http) if (!topt->http)
strcpy(g->Message, "Missing REST HTTP option"); sprintf(g->Message, "Missing %s HTTP address", topt->type);
else else
ok= true; ok= true;

2
storage/connect/jsonudf.cpp
View File

@ -1829,7 +1829,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
} // endif s } // endif s
return (char*) s; return s;
} // endif count } // endif count
return (PCSZ) "Key"; return (PCSZ) "Key";

2
storage/connect/mysql-test/connect/r/jdbc_postgresql.result
View File

@ -1,4 +1,4 @@
SET GLOBAL connect_class_path='C:/MariaDB-10.2/MariaDB/storage/connect/mysql-test/connect/std_data/JavaWrappers.jar;C:/Jconnectors/postgresql-42.2.1.jar'; SET GLOBAL connect_class_path='C:/MariaDB-10.0/MariaDB/storage/connect/mysql-test/connect/std_data/JavaWrappers.jar;C:/Jconnectors/postgresql-42.2.1.jar';
CREATE TABLE t2 ( CREATE TABLE t2 (
command varchar(128) not null, command varchar(128) not null,
number int(5) not null flag=1, number int(5) not null flag=1,

2
storage/connect/tabwmi.cpp
View File

@ -771,7 +771,7 @@ void WMICOL::ReadColumn(PGLOBAL g)
break; break;
case VT_I4: case VT_I4:
case VT_UI4: case VT_UI4:
Value->SetValue(Prop.lVal); Value->SetValue((long long)Prop.lVal);
break; break;
case VT_I2: case VT_I2:
case VT_UI2: case VT_UI2: