Merge branch '10.2' into 10.3

MariaDB · Sep 2, 2019 · b0ff5a6 · b0ff5a6
2 parents 597b070 + d5a11a1
commit b0ff5a6
Show file tree

Hide file tree

Showing 33 changed files with 2,078 additions and 1,585 deletions.
diff --git a/libmariadb b/libmariadb
diff --git a/sql/item.h b/sql/item.h
@@ -670,7 +670,7 @@ class Item: public Value_source,
   /* Cache of the result of is_expensive(). */
   int8 is_expensive_cache;
 
-  /* Reuse size, only used by SP local variable assignment, otherwize 0 */
+  /* Reuse size, only used by SP local variable assignment, otherwise 0 */
   uint rsize;
 
 protected:

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
@@ -2072,7 +2072,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
 
 
 /******************************************************************************
-  Check that all fields with arn't null_fields are used
+  Check that there aren't any null_fields
 ******************************************************************************/
 
 

diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
@@ -73,6 +73,10 @@ ELSE(NOT UNIX)
   tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
   # Add exception handling to the CONNECT project)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
+  SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD")
   SET(IPHLPAPI_LIBRARY iphlpapi.lib)
   IF(MSVC AND (CMAKE_CXX_COMPILER_ID MATCHES Clang))
     # Connect does not work with clang-cl
@@ -118,7 +122,6 @@ IF(CONNECT_WITH_LIBXML2)
   FIND_PACKAGE(LibXml2)
   IF (LIBXML2_FOUND)
     INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-    SET(ZLIB_LIBRARY "z") # see ZLIB_INCLUDE_DIR below
     SET(XML_LIBRARY  ${LIBXML2_LIBRARIES})
     SET(CONNECT_SOURCES ${CONNECT_SOURCES} libdoc.cpp libdoc.h)
     add_definitions(-DLIBXML2_SUPPORT)
@@ -312,6 +315,30 @@ IF(CONNECT_WITH_MONGO)
 ENDIF(CONNECT_WITH_MONGO)
 
 
+#
+# REST
+#
+
+OPTION(CONNECT_WITH_REST "Compile CONNECT storage engine with REST support" ON)
+
+IF(CONNECT_WITH_REST)
+  MESSAGE(STATUS "=====> REST support is ON")
+  FIND_PACKAGE(cpprestsdk)
+  IF (cpprestsdk_FOUND)
+    MESSAGE(STATUS "=====> 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})
+	ENDIF(UNIX)
+    SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp restget.cpp tabrest.h)
+    add_definitions(-DREST_SUPPORT)
+  ELSE(NOT cpprestsdk_FOUND)
+    MESSAGE(STATUS "=====> cpprestsdk package not found")
+  ENDIF (cpprestsdk_FOUND)
+ENDIF(CONNECT_WITH_REST)
+
 #
 # XMAP
 #
@@ -331,24 +358,16 @@ MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES}
   COMPONENT connect-engine
   RECOMPILE_FOR_EMBEDDED
   LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY}
-    ${ODBC_LIBRARY} ${JDBC_LIBRARY} ${MONGOC_LIBRARY} ${IPHLPAPI_LIBRARY})
+    ${ODBC_LIBRARY} ${JDBC_LIBRARY} ${MONGOC_LIBRARY} ${IPHLPAPI_LIBRARY} ${REST_LIBRARY})
 
 IF(NOT TARGET connect)
   RETURN()
 ENDIF()
 
-# Don't link with bundled zlib and systel libxml2 at the same time.
-# System libxml2 uses system zlib, might conflict with the bundled one.
-IF (XML_LIBRARY AND BUILD_BUNDLED_ZLIB)
-  GET_PROPERTY(INCS TARGET connect PROPERTY INCLUDE_DIRECTORIES)
-  LIST(REMOVE_ITEM INCS ${ZLIB_INCLUDE_DIR})
-  SET_PROPERTY(TARGET connect PROPERTY INCLUDE_DIRECTORIES ${INCS})
-ENDIF()
-
 IF(WIN32)
   IF (libmongoc-1.0_FOUND)
-	  SET_TARGET_PROPERTIES(connect PROPERTIES LINK_FLAGS
-	    "/DELAYLOAD:libbson-1.0.dll /DELAYLOAD:libmongoc-1.0.dll")
+    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
@@ -376,3 +395,4 @@ IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
     ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar
     DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
 ENDIF()
+
diff --git a/storage/connect/array.cpp b/storage/connect/array.cpp
@@ -1,7 +1,7 @@
 /************* Array C++ Functions Source Code File (.CPP) *************/
 /*  Name: ARRAY.CPP  Version 2.3                                       */
 /*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          2005-2017    */
+/*  (C) Copyright to the author Olivier BERTRAND          2005-2019    */
 /*                                                                     */
 /*  This file contains the XOBJECT derived class ARRAY functions.      */
 /*  ARRAY is used for elaborate type of processing, such as sorting    */
@@ -67,7 +67,7 @@ PARRAY MakeValueArray(PGLOBAL g, PPARM pp);  // avoid gcc warning
 /*  MakeValueArray: Makes a value array from a value list.             */
 /***********************************************************************/
 PARRAY MakeValueArray(PGLOBAL g, PPARM pp)
-  {
+{
   int    n, valtyp = 0;
   size_t len = 0;
   PARRAY par;
@@ -82,8 +82,7 @@ PARRAY MakeValueArray(PGLOBAL g, PPARM pp)
   if ((valtyp = pp->Type) != TYPE_STRING)
     len = 1;
 
- 	if (trace(1))
- 		htrc("valtyp=%d len=%d\n", valtyp, len);
+ 	xtrc(1, "valtyp=%d len=%d\n", valtyp, len);
 
   /*********************************************************************/
   /*  Firstly check the list and count the number of values in it.     */
@@ -127,13 +126,13 @@ PARRAY MakeValueArray(PGLOBAL g, PPARM pp)
         // Integer stored inside pp->Value
         par->AddValue(g, parmp->Intval);
         break;
-      } // endswitch valtyp
+    } // endswitch valtyp
 
   /*********************************************************************/
   /*  Send back resulting array.                                       */
   /*********************************************************************/
   return par;
-  } // end of MakeValueArray
+} // end of MakeValueArray
 
 /* -------------------------- Class ARRAY ---------------------------- */
 
@@ -151,6 +150,9 @@ ARRAY::ARRAY(PGLOBAL g, int type, int size, int length, int prec)
   Type = type;
   Xsize = -1;
   Len = 1;
+	X = 0;
+	Inf = 0;
+	Sup = 0;
 
   switch (type) {
     case TYPE_STRING:
@@ -281,130 +283,109 @@ void ARRAY::Empty(void)
 /*  Add a string element to an array.                                  */
 /***********************************************************************/
 bool ARRAY::AddValue(PGLOBAL g, PSZ strp)
-  {
+{
   if (Type != TYPE_STRING) {
     sprintf(g->Message, MSG(ADD_BAD_TYPE), GetTypeName(Type), "CHAR");
     return true;
-    } // endif Type
-
-  if (trace(1))
-    htrc(" adding string(%d): '%s'\n", Nval, strp);
+  } // endif Type
 
-//Value->SetValue_psz(strp);
-//Vblp->SetValue(valp, Nval++);
+  xtrc(1, " adding string(%d): '%s'\n", Nval, strp);
   Vblp->SetValue(strp, Nval++);
   return false;
-  } // end of AddValue
+} // end of AddValue
 
 /***********************************************************************/
 /*  Add a char pointer element to an array.                            */
 /***********************************************************************/
 bool ARRAY::AddValue(PGLOBAL g, void *p)
-  {
+{
   if (Type != TYPE_PCHAR) {
     sprintf(g->Message, MSG(ADD_BAD_TYPE), GetTypeName(Type), "PCHAR");
     return true;
-    } // endif Type
-
-  if (trace(1))
-    htrc(" adding pointer(%d): %p\n", Nval, p);
+  } // endif Type
 
+  xtrc(1, " adding pointer(%d): %p\n", Nval, p);
   Vblp->SetValue((PSZ)p, Nval++);
   return false;
-  } // end of AddValue
+} // end of AddValue
 
 /***********************************************************************/
 /*  Add a short integer element to an array.                           */
 /***********************************************************************/
 bool ARRAY::AddValue(PGLOBAL g, short n)
-  {
+{
   if (Type != TYPE_SHORT) {
     sprintf(g->Message, MSG(ADD_BAD_TYPE), GetTypeName(Type), "SHORT");
     return true;
-    } // endif Type
-
-  if (trace(1))
-    htrc(" adding SHORT(%d): %hd\n", Nval, n);
+  } // endif Type
 
-//Value->SetValue(n);
-//Vblp->SetValue(valp, Nval++);
+  xtrc(1, " adding SHORT(%d): %hd\n", Nval, n);
   Vblp->SetValue(n, Nval++);
   return false;
-  } // end of AddValue
+} // end of AddValue
 
 /***********************************************************************/
 /*  Add an integer element to an array.                                */
 /***********************************************************************/
 bool ARRAY::AddValue(PGLOBAL g, int n)
-  {
+{
   if (Type != TYPE_INT) {
     sprintf(g->Message, MSG(ADD_BAD_TYPE), GetTypeName(Type), "INTEGER");
     return true;
-    } // endif Type
+  } // endif Type
 
-  if (trace(1))
-    htrc(" adding int(%d): %d\n", Nval, n);
-
-//Value->SetValue(n);
-//Vblp->SetValue(valp, Nval++);
+  xtrc(1, " adding int(%d): %d\n", Nval, n);
   Vblp->SetValue(n, Nval++);
   return false;
-  } // end of AddValue
+} // end of AddValue
 
 /***********************************************************************/
 /*  Add a double float element to an array.                            */
 /***********************************************************************/
 bool ARRAY::AddValue(PGLOBAL g, double d)
-  {
+{
   if (Type != TYPE_DOUBLE) {
     sprintf(g->Message, MSG(ADD_BAD_TYPE), GetTypeName(Type), "DOUBLE");
     return true;
-    } // endif Type
-
-  if (trace(1))
-    htrc(" adding float(%d): %lf\n", Nval, d);
+  } // endif Type
 
+  xtrc(1, " adding float(%d): %lf\n", Nval, d);
   Value->SetValue(d);
   Vblp->SetValue(Value, Nval++);
   return false;
-  } // end of AddValue
+} // end of AddValue
 
 /***********************************************************************/
 /*  Add the value of a XOBJECT block to an array.                      */
 /***********************************************************************/
 bool ARRAY::AddValue(PGLOBAL g, PXOB xp)
-  {
-  if (Type != xp->GetResultType()) {
-    sprintf(g->Message, MSG(ADD_BAD_TYPE),
-            GetTypeName(xp->GetResultType()), GetTypeName(Type));
-    return true;
-    } // endif Type
-
-  if (trace(1))
-    htrc(" adding (%d) from xp=%p\n", Nval, xp);
+{
+	if (Type != xp->GetResultType()) {
+		sprintf(g->Message, MSG(ADD_BAD_TYPE),
+			GetTypeName(xp->GetResultType()), GetTypeName(Type));
+		return true;
+	} // endif Type
 
-//AddValue(xp->GetValue());
-  Vblp->SetValue(xp->GetValue(), Nval++);
-  return false;
-  } // end of AddValue
+	xtrc(1, " adding (%d) from xp=%p\n", Nval, xp);
+	Vblp->SetValue(xp->GetValue(), Nval++);
+	return false;
+} // end of AddValue
 
 /***********************************************************************/
 /*  Add a value to an array.                                           */
 /***********************************************************************/
 bool ARRAY::AddValue(PGLOBAL g, PVAL vp)
-  {
+{
   if (Type != vp->GetType()) {
     sprintf(g->Message, MSG(ADD_BAD_TYPE),
             GetTypeName(vp->GetType()), GetTypeName(Type));
     return true;
-    } // endif Type
-
-  if (trace(1))
-    htrc(" adding (%d) from vp=%p\n", Nval, vp);
+  } // endif Type
 
+  xtrc(1, " adding (%d) from vp=%p\n", Nval, vp);
   Vblp->SetValue(vp, Nval++);
   return false;
-  } // end of AddValue
+} // end of AddValue
 
 /***********************************************************************/
 /*  Retrieve the nth value of the array.                               */
@@ -973,7 +954,7 @@ int ARRAY::BlockTest(PGLOBAL, int opc, int opm,
 /*  MakeArrayList: Makes a value list from an SQL IN array (in work).  */
 /***********************************************************************/
 PSZ ARRAY::MakeArrayList(PGLOBAL g)
-  {
+{
   char   *p, *tp;
   int     i;
   size_t  z, len = 2;
@@ -988,11 +969,9 @@ PSZ ARRAY::MakeArrayList(PGLOBAL g)
     Value->SetValue_pvblk(Vblp, i);
     Value->Prints(g, tp, z);
     len += strlen(tp);
-    } // enfor i
-
-  if (trace(1))
-    htrc("Arraylist: len=%d\n", len);
+  } // enfor i
 
+  xtrc(1, "Arraylist: len=%d\n", len);
   p = (char *)PlugSubAlloc(g, NULL, len);
   strcpy(p, "(");
 
@@ -1001,19 +980,17 @@ PSZ ARRAY::MakeArrayList(PGLOBAL g)
     Value->Prints(g, tp, z);
     strcat(p, tp);
     strcat(p, (++i == Nval) ? ")" : ",");
-    } // enfor i
-
-  if (trace(1))
-    htrc("Arraylist: newlen=%d\n", strlen(p));
+  } // enfor i
 
+  xtrc(1, "Arraylist: newlen=%d\n", strlen(p));
   return p;
-  } // end of MakeArrayList
+} // end of MakeArrayList
 
 /***********************************************************************/
 /*  Make file output of ARRAY  contents.                               */
 /***********************************************************************/
 void ARRAY::Printf(PGLOBAL g, FILE *f, uint n)
-  {
+{
   char m[64];
   int  lim = MY_MIN(Nval,10);
 
@@ -1035,19 +1012,19 @@ void ARRAY::Printf(PGLOBAL g, FILE *f, uint n)
   } else
     fprintf(f, "%sVALLST: numval=%d\n", m, Nval);
 
-  } // end of Printf
+} // end of Printf
 
 /***********************************************************************/
 /*  Make string output of ARRAY  contents.                             */
 /***********************************************************************/
 void ARRAY::Prints(PGLOBAL, char *ps, uint z)
-  {
+{
   if (z < 16)
     return;
 
   sprintf(ps, "ARRAY: type=%d\n", Type);
   // More to be implemented later
-  } // end of Prints
+} // end of Prints
 
 /* -------------------------- Class MULAR ---------------------------- */