Merge branch '10.1' into 10.2

4 files changed, 8 insertions, 44 deletions

diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index 5c8cdcb86ed..408f6d223a1 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -346,40 +346,6 @@ IF(WIN32)
     DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
 ENDIF(WIN32)
 
-IF(NOT TARGET connect)
-  RETURN()
-ENDIF()
-
-# Install some extra files that belong to connect engine
-IF(WIN32)
-  # install ha_connect.lib
-  GET_TARGET_PROPERTY(CONNECT_LOCATION connect LOCATION)
-  STRING(REPLACE "dll" "lib" CONNECT_LIB ${CONNECT_LOCATION})
-  IF(CMAKE_CONFIGURATION_TYPES)
-    STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
-      CONNECT_LIB ${CONNECT_LIB})
-  ENDIF()
-  INSTALL(FILES ${CONNECT_LIB}
-    DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
-ENDIF(WIN32)
-
-IF(NOT TARGET connect)
-  RETURN()
-ENDIF()
-
-# Install some extra files that belong to connect engine
-IF(WIN32)
-  # install ha_connect.lib
-  GET_TARGET_PROPERTY(CONNECT_LOCATION connect LOCATION)
-  STRING(REPLACE "dll" "lib" CONNECT_LIB ${CONNECT_LOCATION})
-  IF(CMAKE_CONFIGURATION_TYPES)
-    STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
-      CONNECT_LIB ${CONNECT_LIB})
-  ENDIF()
-  INSTALL(FILES ${CONNECT_LIB}
-    DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
-ENDIF(WIN32)
-
 IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
   # TODO: Find how to compile and install the java wrapper classes
   # Find required libraries and include directories
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index 404b3dca0ad..f9276783365 100644
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -41,8 +41,6 @@ static PJSON JsonNew(PGLOBAL g, JTYP type);
 static PJVAL JvalNew(PGLOBAL g, JTYP type, void *vp = NULL);
 static PJSNX JsnxNew(PGLOBAL g, PJSON jsp, int type, int len = 64);
 
-void json_array_deinit(UDF_INIT* initid);
-
 static uint JsonGrpSize = 10;
 
 /*********************************************************************************/
diff --git a/storage/connect/tabjdbc.cpp b/storage/connect/tabjdbc.cpp
index adbfb2168ae..275b5edaeae 100644
--- a/storage/connect/tabjdbc.cpp
+++ b/storage/connect/tabjdbc.cpp
@@ -572,7 +572,7 @@ bool TDBJDBC::OpenDB(PGLOBAL g)
 
 		if (Memory < 3) {
 			// Method will depend on cursor type
-			if ((Rbuf = Jcp->Rewind(Query->GetStr())) < 0)
+			if ((Rbuf = Query ? Jcp->Rewind(Query->GetStr()) : 0) < 0)
 				if (Mode != MODE_READX) {
 					Jcp->Close();
 				  return true;
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp
index b66682e0190..9e4f5ab987d 100644
--- a/storage/connect/tabjson.cpp
+++ b/storage/connect/tabjson.cpp
@@ -195,7 +195,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
 	tdp->Fn = GetStringTableOption(g, topt, "Filename", NULL);
 
 	if (!(tdp->Database = SetPath(g, db)))
-		return NULL;
+		return 0;
 
 	tdp->Objname = GetStringTableOption(g, topt, "Object", NULL);
 	tdp->Base = GetIntegerTableOption(g, topt, "Base", 0) ? 1 : 0;
@@ -243,14 +243,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
 			tjsp = new(g) TDBJSON(tdp, new(g) MAPFAM(tdp));
 
 		if (tjsp->MakeDocument(g))
-			return NULL;
+			return 0;
 
 		jsp = (tjsp->GetDoc()) ? tjsp->GetDoc()->GetValue(0) : NULL;
 	}	else {
 		if (!(tdp->Lrecl = GetIntegerTableOption(g, topt, "Lrecl", 0)))
 			if (!mgo) {
 				sprintf(g->Message, "LRECL must be specified for pretty=%d", tdp->Pretty);
-				return NULL;
+				return 0;
 			}	else
 				tdp->Lrecl = 8192;			 // Should be enough
 
@@ -269,14 +269,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
 				tjnp = new(g) TDBJSN(tdp, new(g) CMGFAM(tdp));
 #else
 				sprintf(g->Message, "Mongo %s Driver not available", "C");
-				return NULL;
+				return 0;
 #endif
 			}	else if (tdp->Driver && toupper(*tdp->Driver) == 'J') {
 #if defined(JAVA_SUPPORT)
 				tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp));
 #else
 				sprintf(g->Message, "Mongo %s Driver not available", "Java");
-				return NULL;
+				return 0;
 #endif
 			}	else {						 // Driver not specified
 #if defined(CMGO_SUPPORT)
@@ -285,7 +285,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
 				tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp));
 #else
 				sprintf(g->Message, MSG(NO_FEAT_SUPPORT), "MONGO");
-				return NULL;
+				return 0;
 #endif
 			}	// endif Driver
 
@@ -304,7 +304,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
 		tjnp->SetG(G);
 
 		if (tjnp->OpenDB(g))
-			return NULL;
+			return 0;
 
 		switch (tjnp->ReadDB(g)) {
 		case RC_EF: