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

7 files changed, 57 insertions, 63 deletions

diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index be1197b4c58..d7651680e1c 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -365,26 +365,26 @@ IF(CONNECT_WITH_REST)
 # MESSAGE(STATUS "=====> REST support is ON")
   SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp tabrest.h)
   add_definitions(-DREST_SUPPORT)
-# FIND_PACKAGE(cpprestsdk QUIET)
-# IF (cpprestsdk_FOUND)
+#  FIND_PACKAGE(cpprestsdk QUIET)
+#  IF (cpprestsdk_FOUND)
 #	IF(UNIX)
-##    INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR})
-##    If needed edit next line to set the path to libcpprest.so
-#     SET(REST_LIBRARY -lcpprest)
-#     MESSAGE (STATUS ${REST_LIBRARY})
+##     INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR})
+##     If needed edit next line to set the path to libcpprest.so
+#      SET(REST_LIBRARY -lcpprest)
+#      MESSAGE (STATUS ${REST_LIBRARY})
 #	ELSE(NOT UNIX)
-##    Next line sets debug compile mode matching cpprest_2_10d.dll
-##    when it was binary installed (can be change later in Visual Studio)
-##    Comment it out if not needed depending on your cpprestsdk installation.
+##     Next line sets debug compile mode matching cpprest_2_10d.dll
+##     when it was binary installed (can be change later in Visual Studio)
+##     Comment it out if not needed depending on your cpprestsdk installation.
 #	  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
 #	ENDIF(UNIX)
-##  IF(REST_LIBRARY)     why this? how about Windows
-#   SET(CONNECT_SOURCES ${CONNECT_SOURCES} restget.cpp)
-#   add_definitions(-DREST_SOURCE)
-##  ENDIF()
-##ELSE(NOT cpprestsdk_FOUND)
-##  MESSAGE(STATUS "=====> cpprestsdk package not found")
-# ENDIF (cpprestsdk_FOUND)
+##   IF(REST_LIBRARY)     why this? how about Windows
+#    SET(CONNECT_SOURCES ${CONNECT_SOURCES} restget.cpp)
+#    add_definitions(-DREST_SOURCE)
+##   ENDIF()
+## ELSE(NOT cpprestsdk_FOUND)
+#   MESSAGE(STATUS "=====> cpprestsdk package not found")
+#  ENDIF (cpprestsdk_FOUND)
 ENDIF(CONNECT_WITH_REST)
 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()
 ENDIF()
 
-IF(WIN32)
+IF(MSVC)
   IF (libmongoc-1.0_FOUND)
     SET_TARGET_PROPERTIES(connect PROPERTIES LINK_FLAGS
       "/DELAYLOAD:libbson-1.0.dll /DELAYLOAD:libmongoc-1.0.dll")
-  ENDIF(libmongoc-1.0_FOUND)
-
-# 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 .."
+  ENDIF()
+  # Temporarily disable "conversion from size_t .." warnings
   IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267")
   ENDIF()
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
   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()
 
+
 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/connect.h b/storage/connect/connect.h
index d1fc2ea592f..af1b9ba726e 100644
--- a/storage/connect/connect.h
+++ b/storage/connect/connect.h
@@ -11,7 +11,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
 /**************** Cnt H Declares Source Code File (.H) *****************/
 /*  Name: CONNECT.H    Version 2.4                                     */
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 4b9ab71cb2e..7a40fbd74c7 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -11,7 +11,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
 /**
   @file ha_connect.cc
@@ -266,7 +266,7 @@ bool    Force_Bson(void);
 size_t  GetWorkSize(void);
 void    SetWorkSize(size_t);
 extern "C" const char *msglang(void);
-
+static char *strz(PGLOBAL g, LEX_CSTRING &ls);
 static void PopUser(PCONNECT xp);
 static PCONNECT GetUser(THD *thd, PCONNECT xp);
 static PGLOBAL  GetPlug(THD *thd, PCONNECT& lxp);
@@ -1301,10 +1301,10 @@ PCSZ GetStringTableOption(PGLOBAL g, PTOS options, PCSZ opname, PCSZ sdef)
 		opval= options->filter;
 	else if (!stricmp(opname, "Data_charset"))
     opval= options->data_charset;
-	else if (!stricmp(opname, "Http") || !stricmp(opname, "URL"))
-		opval= options->http;
-	else if (!stricmp(opname, "Uri"))
-		opval= options->uri;
+  else if (!stricmp(opname, "Http") || !stricmp(opname, "URL"))
+    opval= options->http;
+  else if (!stricmp(opname, "Uri"))
+    opval= options->uri;
 
   if (!opval && options->oplist)
     opval= GetListOption(g, opname, options->oplist);
@@ -5642,7 +5642,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
   String   sql(buf, sizeof(buf), system_charset_info);
 
   sql.copy(STRING_WITH_LEN("CREATE TABLE whatever ("), system_charset_info);
-	user= host= pwd= tbl= src= col= ocl= pic= fcl= skc= rnk= zfn= NULL;
+  user= host= pwd= tbl= src= col= ocl= pic= fcl= skc= rnk= zfn= NULL;
 	dsn= url= NULL;
 
   // Get the useful create options
@@ -5694,7 +5694,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
 #if defined(ZIP_SUPPORT)
 		zfn= GetListOption(g, "Zipfile", topt->oplist, NULL);
 #endif   // ZIP_SUPPORT
-	} else {
+  } else {
     host= "localhost";
     user= ((ttp == TAB_ODBC || ttp == TAB_JDBC) ? NULL : "root");
   } // endif option_list
@@ -5831,17 +5831,17 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
 					PJDBCDEF jdef= new(g) JDBCDEF();
 
 					jdef->SetName(create_info->alias.str);
-					sjp = (PJPARM)PlugSubAlloc(g, NULL, sizeof(JDBCPARM));
-					sjp->Driver = driver;
-					//		sjp->Properties = prop;
-					sjp->Fsize = 0;
-					sjp->Scrollable = false;
-
-					if ((rc = jdef->ParseURL(g, url, false)) == RC_OK) {
-						sjp->Url = url;
-						sjp->User = (char*)user;
-						sjp->Pwd = (char*)pwd;
-						ok = true;
+					sjp= (PJPARM)PlugSubAlloc(g, NULL, sizeof(JDBCPARM));
+					sjp->Driver= driver;
+					//		sjp->Properties= prop;
+					sjp->Fsize= 0;
+					sjp->Scrollable= false;
+
+					if ((rc= jdef->ParseURL(g, url, false)) == RC_OK) {
+						sjp->Url= url;
+						sjp->User= (char*)user;
+						sjp->Pwd= (char*)pwd;
+						ok= true;
 					} else if (rc == RC_NF) {
 						if (jdef->GetTabname())
 							tab= (char*)jdef->GetTabname();
@@ -5955,11 +5955,11 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
 				break;
 #endif   // JAVA_SUPPORT
 #if defined(REST_SUPPORT)
-			case TAB_REST:
-				if (!topt->http)
-					strcpy(g->Message, "Missing REST HTTP option");
-				else
-					ok = true;
+      case TAB_REST:
+        if (!topt->http)
+          sprintf(g->Message, "Missing %s HTTP address", topt->type);
+        else
+          ok= true;
 
 				break;
 #endif   // REST_SUPPORT
@@ -6123,11 +6123,11 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
 					break;
 #endif   // LIBXML2_SUPPORT  ||         DOMDOC_SUPPORT
 #if defined(REST_SUPPORT)
-				case TAB_REST:
-					qrp = RESTColumns(g, topt, tab, (char *)db, fnc == FNC_COL);
-					break;
+         case TAB_REST:
+           qrp= RESTColumns(g, topt, tab, (char *)db, fnc == FNC_COL);
+           break;
 #endif   // REST_SUPPORT
-				case TAB_OEM:
+        case TAB_OEM:
 					qrp= OEMColumns(g, topt, tab, (char*)db, fnc == FNC_COL);
 					break;
 				default:
@@ -6444,7 +6444,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
   TABTYPE type;
   TABLE  *st= table;                       // Probably unuseful
   THD    *thd= ha_thd();
-  LEX_CSTRING cnc = table_arg->s->connect_string;
+  LEX_CSTRING cnc= table_arg->s->connect_string;
 #if defined(WITH_PARTITION_STORAGE_ENGINE)
   partition_info *part_info= table_arg->part_info;
 #else		// !WITH_PARTITION_STORAGE_ENGINE
diff --git a/storage/connect/ha_connect.h b/storage/connect/ha_connect.h
index b7090be8b27..3f1ecc18af7 100644
--- a/storage/connect/ha_connect.h
+++ b/storage/connect/ha_connect.h
@@ -11,7 +11,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
 /** @file ha_connect.h
 	Author Olivier Bertrand
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index 2bcbf6ef6d8..2a209f67652 100644
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -1815,7 +1815,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
 			} // endif *s
 
 			if (n < 1)
-                                return (PCSZ) "Key";
+        return (PCSZ) "Key";
 
 			if (!b) {
 				if ((p = (PSZ)PlgDBSubAlloc(g, NULL, n + 1))) {
@@ -1829,7 +1829,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
 
 		} // endif s
 
-		return (char*) s;
+		return s;
 	} // endif count
 
   return (PCSZ) "Key";
diff --git a/storage/connect/mysql-test/connect/r/jdbc_postgresql.result b/storage/connect/mysql-test/connect/r/jdbc_postgresql.result
index 07cc3c465ea..bec1dc8725b 100644
--- a/storage/connect/mysql-test/connect/r/jdbc_postgresql.result
+++ b/storage/connect/mysql-test/connect/r/jdbc_postgresql.result
@@ -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 (
 command varchar(128) not null,
 number int(5) not null flag=1,
diff --git a/storage/connect/tabwmi.cpp b/storage/connect/tabwmi.cpp
index 113f006b5a1..f90ff98ca35 100644
--- a/storage/connect/tabwmi.cpp
+++ b/storage/connect/tabwmi.cpp
@@ -771,7 +771,7 @@ void WMICOL::ReadColumn(PGLOBAL g)
       break;
     case VT_I4:
     case VT_UI4:
-      Value->SetValue(Prop.lVal);
+      Value->SetValue((long long)Prop.lVal);
       break;
     case VT_I2:
     case VT_UI2: