- Remove warning on not used tabtyp variable in connect_assisted_disc…

…overy

  modified:   storage/connect/ha_connect.cc

- Fix a bug causing CONNECT to loop when expanding a JSON column
  when the expanded column value is null or void array.
- Adding the FullArray option to JSON tables.
- Skipping expanded JSON lines when the expanded column value is null.
  modified:   storage/connect/connect.cc
  modified:   storage/connect/tabdos.h
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h

- Fix MDEV-13353 No file privilege for ODBC, JDBC, MONGO, MAC, WMI file types.
  modified:   storage/connect/ha_connect.cc

- Make some Json UDFs  to accept a non JSON item as 1st parameter.
  modified:   storage/connect/json.cpp
  modified:   storage/connect/json.h
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/jsonudf.h

- Update Json UDF tests to cope with above changes.
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
  modified:   storage/connect/mysql-test/connect/r/json_udf_bin.result
  modified:   storage/connect/mysql-test/connect/r/vcol.result
  modified:   storage/connect/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/vcol.test

- Fix some compiler warning treated as error
  PlugSubAlloc no more exported because it does throw.
  modified:   storage/connect/global.h
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h

- Other files modified (?) when going back to wrong merge
  modified:   storage/connect/CMakeLists.txt
  modified:   storage/connect/array.cpp
  modified:   storage/connect/colblk.cpp
  modified:   storage/connect/connect.cc
  modified:   storage/connect/csort.cpp
  modified:   storage/connect/domdoc.cpp
  modified:   storage/connect/filamap.cpp
  modified:   storage/connect/filamgz.cpp
  modified:   storage/connect/filamtxt.cpp
  modified:   storage/connect/filamzip.cpp
  modified:   storage/connect/filter.cpp
  modified:   storage/connect/fmdlex.c
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/macutil.cpp
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/plgdbutl.cpp
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/preparse.h
  modified:   storage/connect/rcmsg.c
  modified:   storage/connect/rcmsg.h
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/tabfmt.cpp
  modified:   storage/connect/tabmac.cpp
  modified:   storage/connect/tabmul.cpp
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabmysql.h
  modified:   storage/connect/tabodbc.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabxml.cpp
  modified:   storage/connect/value.cpp
  modified:   storage/connect/xobject.cpp

storage/connect/CMakeLists.txt

@@ -45,34 +45,17 @@ add_definitions( -DHUGE_SUPPORT -DGZ_SUPPORT )
 # OS specific C flags, definitions and source files.
 #
 IF(UNIX)
-  if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-  # Bar: -Wfatal-errors removed (does not present in gcc on solaris10)
-  if(WITH_WARNINGS)
-    add_definitions(-Wall -Wextra -Wmissing-declarations)
-    #message(STATUS "CONNECT: GCC: All warnings enabled")
-  else()
-    add_definitions(-Wall -Wmissing-declarations)
-    add_definitions(-Wno-write-strings)
-    add_definitions(-Wno-unused-variable)
-    # Bar: -Wno-unused-but-set-variables commented (does not present on sol10)
-    # add_definitions(-Wno-unused-but-set-variable)
-    add_definitions(-Wno-unused-value)
-    add_definitions(-Wno-unused-function)
-    add_definitions(-Wno-parentheses)
-    #add_definitions(-Wno-missing-declarations)
-    # Bar: -Wno-int-to-pointer-cast commended (does not present in gcc on sol10)
-    # add_definitions(-Wno-int-to-pointer-cast)
-    # Bar: -Wno-narrowing commented (does not present in gcc on solaris10)
-    # add_definitions(-Wno-narrowing)
-
-# This switch is for pure C only:
-#   add_definitions(-Wno-implicit-function-declaration)
-# These switches are for C++ only
-#   add_definitions(-Wno-reorder)
-
-    #message(STATUS "CONNECT: GCC: Some warnings disabled")
-  endif(WITH_WARNINGS)
-  endif()
+  MY_CHECK_AND_SET_COMPILER_FLAG("-Wall -Wmissing-declarations")
+  if(NOT WITH_WARNINGS)
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-unused-function")
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-unused-variable")
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-unused-value")
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-parentheses")
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-strict-aliasing")
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-misleading-indentation")
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-format-truncation")
+    MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-implicit-fallthrough")
+  endif(NOT WITH_WARNINGS)
 
   add_definitions( -DUNIX -DLINUX -DUBUNTU )
 
@@ -302,7 +285,7 @@ IF(CONNECT_WITH_MONGO)
         C:/mongo-c-driver/lib
         D:/mongo-c-driver/lib)
   ENDIF(WIN32)
-  FIND_PACKAGE(libmongoc-1.0 1.7)
+  FIND_PACKAGE(libmongoc-1.0 1.7 QUIET)
   IF (libmongoc-1.0_FOUND)
     INCLUDE_DIRECTORIES(${MONGOC_INCLUDE_DIRS})
     SET(MONGOC_LIBRARY  ${MONGOC_LIBRARIES})
@@ -363,6 +346,23 @@ 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(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
@@ -373,4 +373,3 @@ IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
     ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar
     DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
 ENDIF()
-

storage/connect/array.cpp

@@ -520,7 +520,7 @@ bool ARRAY::FilTest(PGLOBAL g, PVAL valp, OPVAL opc, int opm)
 
   } else if (opc != OP_EXIST) {
 		sprintf(g->Message, MSG(MISSING_ARG), opc);
-		throw	(int)TYPE_ARRAY;
+		throw (int)TYPE_ARRAY;
   } else    // OP_EXIST
     return Nval > 0;
 

storage/connect/colblk.cpp

@@ -412,4 +412,3 @@ void SIDBLK::ReadColumn(PGLOBAL)
 //  } // endif Sname
 
   } // end of ReadColumn
-

storage/connect/connect.cc

@@ -1,4 +1,5 @@
-/* Copyright (C) MariaDB Corporation Ab
+/* Copyright (C) Olivier Bertrand 2004 - 2017
+   Copyright (C) MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

storage/connect/csort.cpp

@@ -351,7 +351,7 @@ void CSORT::Qstx(int *base, int *max)
 
   zlo = zhi = cnm = 0;                  // Avoid warning message
 
-  lo = max - base;                      // Number of elements as longs
+  lo = (int)(max - base);                      // Number of elements as longs
 
   if (Dup)
     cnm = Cmpnum(lo);
@@ -472,7 +472,7 @@ void CSORT::Qstx(int *base, int *max)
     i = him + 1;
 
     if (Pof)
-      Pof[him - Pex] = Pof[mid - Pex] = i - j;
+      Pof[him - Pex] = Pof[mid - Pex] = (int)(i - j);
 
     /*******************************************************************/
     /* Look at sizes of the two partitions, do the smaller one first   */
@@ -481,8 +481,8 @@ void CSORT::Qstx(int *base, int *max)
     /* But only repeat (recursively or by branching) if the partition  */
     /* is of at least size THRESH.                                     */
     /*******************************************************************/
-    lo = j - base;
-    hi = max - i;
+    lo = (int)(j - base);
+    hi = (int)(max - i);
 
     if (Dup) {                         // Update progress information
       zlo = Cmpnum(lo);
@@ -726,7 +726,7 @@ void CSORT::Qstc(int *base, int *max)
 
   zlo = zhi = cnm = 0;                  // Avoid warning message
 
-  lo = max - base;                      // Number of elements as longs
+  lo = (int)(max - base);                      // Number of elements as longs
 
   if (Dup)
     cnm = Cmpnum(lo);
@@ -853,7 +853,7 @@ void CSORT::Qstc(int *base, int *max)
     /* the offset array values indicating break point and block size.  */
     /*******************************************************************/
     if (Pof)
-      Pof[lt - Pex] = Pof[(jj - 1) - Pex] = jj - lt;
+      Pof[lt - Pex] = Pof[(jj - 1) - Pex] = (int)(jj - lt);
 
     /*******************************************************************/
     /* Look at sizes of the two partitions, do the smaller one first   */
@@ -862,8 +862,8 @@ void CSORT::Qstc(int *base, int *max)
     /* But only repeat (recursively or by branching) if the partition  */
     /* is of at least size THRESH.                                     */
     /*******************************************************************/
-    lo = lt - base;
-    hi = gt - Swix;
+    lo = (int)(lt - base);
+    hi = (int)(gt - Swix);
 
     if (Dup) {                         // Update progress information
       zlo = Cmpnum(lo);

storage/connect/domdoc.cpp

@@ -13,6 +13,7 @@
 #elif defined(MSX4)
 #import "msxml4.dll"  //Causes error C2872: DOMNodeType: ambiguous symbol  ??
 #elif defined(MSX6)
+#pragma warning(suppress : 4192)
 #import "msxml6.dll"  //Causes error C2872: DOMNodeType: ambiguous symbol  ??
 #else       // MSX4
 #error MSX? is not defined
@@ -540,7 +541,7 @@ PXNODE DOMNODE::AddChildNode(PGLOBAL g, PCSZ name, PXNODE np)
 
   // If name has the format m[n] only m is taken as node name
   if ((p = strchr(name, '[')))
-    pn = BufAlloc(g, name, p - name);
+    pn = BufAlloc(g, name, (int)(p - name));
   else
     pn = name;
 

storage/connect/filamap.cpp

@@ -247,15 +247,15 @@ int MAPFAM::GetRowID(void)
 /***********************************************************************/
 int MAPFAM::GetPos(void)
   {
-  return Fpos - Memory;
+  return (int)(Fpos - Memory);
   } // end of GetPos
 
 /***********************************************************************/
 /*  GetNextPos: return the position of next record.                    */
 /***********************************************************************/
 int MAPFAM::GetNextPos(void)
   {
-  return Mempos - Memory;
+  return (int)(Mempos - Memory);
   } // end of GetNextPos
 
 /***********************************************************************/
@@ -368,7 +368,7 @@ int MAPFAM::ReadBuffer(PGLOBAL g)
 		}	// endif Mempos
 
   // Set caller line buffer
-  len = (Mempos - Fpos) - n;
+  len = (int)(Mempos - Fpos) - n;
 
   // Don't rely on ENDING setting
   if (len > 0 && *(Mempos - 2) == '\r')
@@ -428,7 +428,7 @@ int MAPFAM::DeleteRecords(PGLOBAL g, int irc)
     /*  not required here, just setting of future Spos and Tpos.       */
     /*******************************************************************/
     Tpos = Spos = Fpos;
-  } else if ((n = Fpos - Spos) > 0) {
+  } else if ((n = (int)(Fpos - Spos)) > 0) {
     /*******************************************************************/
     /*  Non consecutive line to delete. Move intermediate lines.       */
     /*******************************************************************/
@@ -461,7 +461,7 @@ int MAPFAM::DeleteRecords(PGLOBAL g, int irc)
       /*****************************************************************/
       /*  Remove extra records.                                        */
       /*****************************************************************/
-      n = Tpos - Memory;
+      n = (int)(Tpos - Memory);
 
 #if defined(__WIN__)
       DWORD drc = SetFilePointer(fp->Handle, n, NULL, FILE_BEGIN);
@@ -627,7 +627,7 @@ int MBKFAM::ReadBuffer(PGLOBAL g)
 			break;
 
   // Set caller line buffer
-  len = (Mempos - Fpos) - Ending;
+  len = (int)(Mempos - Fpos) - Ending;
   memcpy(Tdbp->GetLine(), Fpos, len);
   Tdbp->GetLine()[len] = '\0';
   return RC_OK;

storage/connect/filamgz.cpp

@@ -537,7 +537,7 @@ int ZBKFAM::ReadBuffer(PGLOBAL g)
     while (*NxtLine++ != '\n') ;
 
     // Set caller line buffer
-    n = NxtLine - CurLine - Ending;
+    n = (int)(NxtLine - CurLine - Ending);
     memcpy(Tdbp->GetLine(), CurLine, n);
     Tdbp->GetLine()[n] = '\0';
     return RC_OK;
@@ -588,7 +588,7 @@ int ZBKFAM::ReadBuffer(PGLOBAL g)
     for (NxtLine = CurLine; *NxtLine++ != '\n';) ;
 
     // Set caller line buffer
-    n = NxtLine - CurLine - Ending;
+    n = (int)(NxtLine - CurLine - Ending);
     memcpy(Tdbp->GetLine(), CurLine, n);
     Tdbp->GetLine()[n] = '\0';
     Rbuf = (CurBlk == Block - 1) ? Last : Nrec;
@@ -1087,7 +1087,7 @@ bool ZLBFAM::SetPos(PGLOBAL g, int pos __attribute__((unused)))
 /***********************************************************************/
 int ZLBFAM::ReadBuffer(PGLOBAL g)
   {
-  int   n;
+  size_t   n;
   void *rdbuf;
 
   /*********************************************************************/
@@ -1299,7 +1299,7 @@ int ZLBFAM::WriteBuffer(PGLOBAL g)
   else
     NxtLine = CurLine + Lrecl;
 
-  BlkLen = NxtLine - To_Buf;
+  BlkLen = (int)(NxtLine - To_Buf);
 
   if (WriteCompressedBuffer(g)) {
     Closing = TRUE;      // To tell CloseDB about a Write error

storage/connect/filamtxt.cpp

@@ -1351,7 +1351,7 @@ int BLKFAM::GetPos(void)
 /***********************************************************************/
 int BLKFAM::GetNextPos(void)
   {
-  return Fpos + NxtLine - CurLine;
+  return (int)(Fpos + NxtLine - CurLine);
   } // end of GetNextPos
 
 /***********************************************************************/
@@ -1396,7 +1396,8 @@ int BLKFAM::SkipRecord(PGLOBAL, bool header)
 /***********************************************************************/
 int BLKFAM::ReadBuffer(PGLOBAL g)
   {
-  int i, n, rc = RC_OK;
+  int i, rc = RC_OK;
+  size_t n;
 
   /*********************************************************************/
   /*  Sequential reading when Placed is not true.                      */
@@ -1458,7 +1459,7 @@ int BLKFAM::ReadBuffer(PGLOBAL g)
   // Read the entire next block
   n = fread(To_Buf, 1, (size_t)BlkLen, Stream);
 
-  if (n == BlkLen) {
+  if ((size_t) n == (size_t) BlkLen) {
 //  ReadBlks++;
     num_read++;
     Rbuf = (CurBlk == Block - 1) ? Last : Nrec;
@@ -1497,7 +1498,7 @@ int BLKFAM::ReadBuffer(PGLOBAL g)
 
  fin:
   // Store the current record file position for Delete and Update
-  Fpos = BlkPos[CurBlk] + CurLine - To_Buf;
+  Fpos = (int)(BlkPos[CurBlk] + CurLine - To_Buf);
   return rc;
   } // end of ReadBuffer
 
@@ -1524,7 +1525,7 @@ int BLKFAM::WriteBuffer(PGLOBAL g)
 
     //  Now start the writing process.
     NxtLine = CurLine + strlen(CurLine);
-    BlkLen = NxtLine - To_Buf;
+    BlkLen = (int)(NxtLine - To_Buf);
 
     if (fwrite(To_Buf, 1, BlkLen, Stream) != (size_t)BlkLen) {
       sprintf(g->Message, MSG(FWRITE_ERROR), strerror(errno));

storage/connect/filamzip.cpp

@@ -748,7 +748,7 @@ UNZFAM::UNZFAM(PUNZFAM txfp) : MAPFAM(txfp)
 /***********************************************************************/
 int UNZFAM::GetFileLength(PGLOBAL g)
 {
-	int len = (zutp && zutp->entryopen) ? Top - Memory
+	int len = (zutp && zutp->entryopen) ? (int)(Top - Memory)
 		                                  : TXTFAM::GetFileLength(g) * 3;
 
 	if (trace(1))
@@ -1088,7 +1088,7 @@ int ZIPFAM::WriteBuffer(PGLOBAL g)
 
 	//  Prepare to write the new line
 	strcat(strcpy(To_Buf, Tdbp->GetLine()), (Bin) ? CrLf : "\n");
-	len = strchr(To_Buf, '\n') - To_Buf + 1;
+	len = (int)(strchr(To_Buf, '\n') - To_Buf + 1);
 	return zutp->writeEntry(g, To_Buf, len);
 } // end of WriteBuffer
 

storage/connect/filter.cpp

@@ -84,7 +84,7 @@ BYTE OpBmp(PGLOBAL g, OPVAL opc)
     case OP_EXIST: bt = 0x00; break;
     default:
       sprintf(g->Message, MSG(BAD_FILTER_OP), opc);
-			throw (int)TYPE_ARRAY;
+			throw (int)TYPE_FILTER;
 	} // endswitch opc
 
   return bt;
@@ -1707,7 +1707,7 @@ PFIL PrepareFilter(PGLOBAL g, PFIL fp, bool having)
         break;  // Remove eventual ending separator(s)
 
 //  if (fp->Convert(g, having))
-//		(int)throw TYPE_ARRAY;
+//			throw (int)TYPE_FILTER;
 
     filp = fp;
     fp = fp->Next;