Merge tag 'v3.0.9' into 3.1

CMakeLists.txt

@@ -44,9 +44,10 @@ MATH(EXPR MARIADB_PACKAGE_VERSION_ID "${CPACK_PACKAGE_VERSION_MAJOR} * 10000 +
 
 MACRO(ADD_OPTION _name _text _default)
   IF(NOT DEFINED ${_name})
-    SET(${_name} ${_default})
+    OPTION(${OPT}${_name} "${_text}" "${_default}")
+  ELSE()
+    OPTION(${OPT}${_name} "${_text}" "${${_name}}")
   ENDIF()
-  OPTION(${OPT}${_name} "${_text}" "${${_name}}")
 ENDMACRO()
 
 ### Options ###
@@ -212,6 +213,13 @@ IF(NOT WIN32)
   TEST_BIG_ENDIAN(HAVE_BIGENDIAN)
 ENDIF()
 
+# check for various include files
+INCLUDE(${CC_SOURCE_DIR}/cmake/CheckIncludeFiles.cmake)
+# check for various functions
+INCLUDE(${CC_SOURCE_DIR}/cmake/CheckFunctions.cmake)
+# check for various types
+INCLUDE(${CC_SOURCE_DIR}/cmake/CheckTypes.cmake)
+
 IF(UNIX)
   SEARCH_LIBRARY(LIBDL dlopen "dl")
   IF(NOT ${LIBDL})
@@ -256,13 +264,6 @@ ELSEIF()
   SET(HAVE_THREADS ${CMAKE_USE_PTHREADS})
 ENDIF()
 
-# check for various include files
-INCLUDE(${CC_SOURCE_DIR}/cmake/CheckIncludeFiles.cmake)
-# check for various functions
-INCLUDE(${CC_SOURCE_DIR}/cmake/CheckFunctions.cmake)
-# check for various types
-INCLUDE(${CC_SOURCE_DIR}/cmake/CheckTypes.cmake)
-
 IF(NOT DEFAULT_CHARSET)
   SET(DEFAULT_CHARSET "latin1")
 ENDIF()
@@ -333,6 +334,16 @@ IF(NOT WITH_SSL STREQUAL "OFF")
   MARK_AS_ADVANCED(SSL_SOURCES)
 ENDIF()
 
+SET(ENABLED_LOCAL_INFILE "AUTO" CACHE STRING "If we should should enable LOAD DATA LOCAL by default (OFF/ON/AUTO)")
+MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)
+IF (ENABLED_LOCAL_INFILE MATCHES "^(0|FALSE)$")
+  SET(ENABLED_LOCAL_INFILE OFF)
+ELSEIF(ENABLED_LOCAL_INFILE MATCHES "^(1|TRUE)$")
+  SET(ENABLED_LOCAL_INFILE ON)
+ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
+  MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
+ENDIF()
+
 IF(NOT WIN32)
   INCLUDE(${CC_SOURCE_DIR}/cmake/FindIconv.cmake)
 ENDIF()

cmake/CheckFunctions.cmake

@@ -13,106 +13,11 @@
 
 INCLUDE(CheckFunctionExists)
 
-CHECK_FUNCTION_EXISTS (access HAVE_ACCESS)
-CHECK_FUNCTION_EXISTS (aiowait HAVE_AIOWAIT)
-CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM)
 CHECK_FUNCTION_EXISTS (alloca HAVE_ALLOCA)
-CHECK_FUNCTION_EXISTS (bcmp HAVE_BCMP)
-CHECK_FUNCTION_EXISTS (bfill HAVE_BFILL)
-CHECK_FUNCTION_EXISTS (bmove HAVE_BMOVE)
-CHECK_FUNCTION_EXISTS (bzero HAVE_BZERO)
-CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME)
-CHECK_FUNCTION_EXISTS (compress HAVE_COMPRESS)
-CHECK_FUNCTION_EXISTS (crypt HAVE_CRYPT)
 CHECK_FUNCTION_EXISTS (dlerror HAVE_DLERROR)
 CHECK_FUNCTION_EXISTS (dlopen HAVE_DLOPEN)
-CHECK_FUNCTION_EXISTS (fchmod HAVE_FCHMOD)
 CHECK_FUNCTION_EXISTS (fcntl HAVE_FCNTL)
-CHECK_FUNCTION_EXISTS (fconvert HAVE_FCONVERT)
-CHECK_FUNCTION_EXISTS (fdatasync HAVE_FDATASYNC)
-CHECK_FUNCTION_EXISTS (fesetround HAVE_FESETROUND)
-CHECK_FUNCTION_EXISTS (finite HAVE_FINITE)
-CHECK_FUNCTION_EXISTS (fseeko HAVE_FSEEKO)
-CHECK_FUNCTION_EXISTS (fsync HAVE_FSYNC)
-CHECK_FUNCTION_EXISTS (getaddrinfo HAVE_GETADDRINFO)
-CHECK_FUNCTION_EXISTS (getcwd HAVE_GETCWD)
-CHECK_FUNCTION_EXISTS (gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
-CHECK_FUNCTION_EXISTS (gethostbyname_r HAVE_GETHOSTBYNAME_R)
-CHECK_FUNCTION_EXISTS (gethrtime HAVE_GETHRTIME)
-CHECK_FUNCTION_EXISTS (getnameinfo HAVE_GETNAMEINFO)
-CHECK_FUNCTION_EXISTS (getpagesize HAVE_GETPAGESIZE)
-CHECK_FUNCTION_EXISTS (getpass HAVE_GETPASS)
-CHECK_FUNCTION_EXISTS (getpassphrase HAVE_GETPASSPHRASE)
-CHECK_FUNCTION_EXISTS (getpwnam HAVE_GETPWNAM)
-CHECK_FUNCTION_EXISTS (getpwuid HAVE_GETPWUID)
-CHECK_FUNCTION_EXISTS (getrlimit HAVE_GETRLIMIT)
-CHECK_FUNCTION_EXISTS (getrusage HAVE_GETRUSAGE)
-CHECK_FUNCTION_EXISTS (getwd HAVE_GETWD)
-CHECK_FUNCTION_EXISTS (gmtime_r HAVE_GMTIME_R)
-CHECK_FUNCTION_EXISTS (initgroups HAVE_INITGROUPS)
-CHECK_FUNCTION_EXISTS (ldiv HAVE_LDIV)
-CHECK_FUNCTION_EXISTS (localtime_r HAVE_LOCALTIME_R)
-CHECK_FUNCTION_EXISTS (log2 HAVE_LOG2)
-CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
-CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT)
-CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE)
-CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO)
-CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
 CHECK_FUNCTION_EXISTS (memcpy HAVE_MEMCPY)
-CHECK_FUNCTION_EXISTS (memmove HAVE_MEMMOVE)
-CHECK_FUNCTION_EXISTS (mkstemp HAVE_MKSTEMP)
-CHECK_FUNCTION_EXISTS (mlock HAVE_MLOCK)
-CHECK_FUNCTION_EXISTS (mlockall HAVE_MLOCKALL)
-CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
-CHECK_FUNCTION_EXISTS (mmap64 HAVE_MMAP64)
 CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
 CHECK_FUNCTION_EXISTS (setlocale HAVE_SETLOCALE)
-CHECK_FUNCTION_EXISTS (perror HAVE_PERROR)
 CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
-CHECK_FUNCTION_EXISTS (pread HAVE_PREAD)
-CHECK_FUNCTION_EXISTS (pthread_attr_create HAVE_PTHREAD_ATTR_CREATE)
-CHECK_FUNCTION_EXISTS (pthread_attr_getstacksize HAVE_PTHREAD_ATTR_GETSTACKSIZE)
-CHECK_FUNCTION_EXISTS (pthread_attr_setprio HAVE_PTHREAD_ATTR_SETPRIO)
-CHECK_FUNCTION_EXISTS (pthread_attr_setschedparam HAVE_PTHREAD_ATTR_SETSCHEDPARAM)
-CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
-CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
-CHECK_FUNCTION_EXISTS (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE)
-CHECK_FUNCTION_EXISTS (pthread_init HAVE_PTHREAD_INIT)
-CHECK_FUNCTION_EXISTS (pthread_key_delete HAVE_PTHREAD_KEY_DELETE)
-CHECK_FUNCTION_EXISTS (pthread_kill HAVE_PTHREAD_KILL)
-CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK)
-CHECK_FUNCTION_EXISTS (pthread_setprio_np HAVE_PTHREAD_SETPRIO_NP)
-CHECK_FUNCTION_EXISTS (pthread_setschedparam HAVE_PTHREAD_SETSCHEDPARAM)
-CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
-CHECK_FUNCTION_EXISTS (pthread_threadmask HAVE_PTHREAD_THREADMASK)
-CHECK_FUNCTION_EXISTS (pthread_yield_np HAVE_PTHREAD_YIELD_NP)
-CHECK_FUNCTION_EXISTS (readdir_r HAVE_READDIR_R)
-CHECK_FUNCTION_EXISTS (readlink HAVE_READLINK)
-CHECK_FUNCTION_EXISTS (realpath HAVE_REALPATH)
-CHECK_FUNCTION_EXISTS (rename HAVE_RENAME)
-CHECK_FUNCTION_EXISTS (sched_yield HAVE_SCHED_YIELD)
-CHECK_FUNCTION_EXISTS (select HAVE_SELECT)
-CHECK_FUNCTION_EXISTS (setfd HAVE_SETFD)
-CHECK_FUNCTION_EXISTS (setfilepointer HAVE_SETFILEPOINTER)
-CHECK_FUNCTION_EXISTS (sigaction HAVE_SIGACTION)
-CHECK_FUNCTION_EXISTS (sigthreadmask HAVE_SIGTHREADMASK)
-CHECK_FUNCTION_EXISTS (sigwait HAVE_SIGWAIT)
-CHECK_FUNCTION_EXISTS (sleep HAVE_SLEEP)
-CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
-CHECK_FUNCTION_EXISTS (stpcpy HAVE_STPCPY)
-CHECK_FUNCTION_EXISTS (strerror HAVE_STRERROR)
-CHECK_FUNCTION_EXISTS (strlcpy HAVE_STRLCPY)
-CHECK_FUNCTION_EXISTS (strnlen HAVE_STRNLEN)
-CHECK_FUNCTION_EXISTS (strpbrk HAVE_STRPBRK)
-CHECK_FUNCTION_EXISTS (strsep HAVE_STRSEP)
-CHECK_FUNCTION_EXISTS (strstr HAVE_STRSTR)
-CHECK_FUNCTION_EXISTS (strtok_r HAVE_STRTOK_R)
-CHECK_FUNCTION_EXISTS (strtol HAVE_STRTOL)
-CHECK_FUNCTION_EXISTS (strtoll HAVE_STRTOLL)
-CHECK_FUNCTION_EXISTS (strtoul HAVE_STRTOUL)
-CHECK_FUNCTION_EXISTS (strtoull HAVE_STRTOULL)
-CHECK_FUNCTION_EXISTS (tell HAVE_TELL)
-CHECK_FUNCTION_EXISTS (thr_setconcurrency HAVE_THR_SETCONCURRENCY)
-CHECK_FUNCTION_EXISTS (thr_yield HAVE_THR_YIELD)
-CHECK_FUNCTION_EXISTS (vasprintf HAVE_VASPRINTF)
-CHECK_FUNCTION_EXISTS (vsnprintf HAVE_VSNPRINTF)

cmake/CheckIncludeFiles.cmake

@@ -14,21 +14,10 @@ INCLUDE(CheckIncludeFiles)
 
 CHECK_INCLUDE_FILES (alloca.h HAVE_ALLOCA_H)
 CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
-CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H)
-CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
 CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
-CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)
-CHECK_INCLUDE_FILES (fenv.h HAVE_FENV_H)
 CHECK_INCLUDE_FILES (float.h HAVE_FLOAT_H)
-CHECK_INCLUDE_FILES (fpu/control.h HAVE_FPU_CONTROL_H)
-CHECK_INCLUDE_FILES (grp.h HAVE_GRP_H)
-CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)
 CHECK_INCLUDE_FILES (limits.h HAVE_LIMITS_H)
-CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
-CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)
-CHECK_INCLUDE_FILES (netinet/in.h HAVE_NETINET_IN_H)
-CHECK_INCLUDE_FILES (paths.h HAVE_PATHS_H)
 CHECK_INCLUDE_FILES (pwd.h HAVE_PWD_H)
 CHECK_INCLUDE_FILES (sched.h HAVE_SCHED_H)
 CHECK_INCLUDE_FILES (select.h HAVE_SELECT_H)
@@ -49,28 +38,12 @@ ENDIF(HAVE_STDINT_H)
 CHECK_INCLUDE_FILES (stdlib.h HAVE_STDLIB_H)
 CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)
 CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
-CHECK_INCLUDE_FILES (synch.h HAVE_SYNCH_H)
-CHECK_INCLUDE_FILES (sys/fpu.h HAVE_SYS_FPU_H)
+
 CHECK_INCLUDE_FILES (sys/ioctl.h HAVE_SYS_IOCTL_H)
-CHECK_INCLUDE_FILES (sys/ipc.h HAVE_SYS_IPC_H)
-CHECK_INCLUDE_FILES (sys/mman.h HAVE_SYS_MMAN_H)
-CHECK_INCLUDE_FILES (sys/prctl.h HAVE_SYS_PRCTL_H)
 CHECK_INCLUDE_FILES (sys/select.h HAVE_SYS_SELECT_H)
-CHECK_INCLUDE_FILES (sys/shm.h HAVE_SYS_SHM_H)
-
 CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
-IF(HAVE_SYS_SOCKET_H)
-  SET(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
-ENDIF(HAVE_SYS_SOCKET_H)
-
-CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILES (sys/stream.h HAVE_SYS_STREAM_H)
-CHECK_INCLUDE_FILES (sys/timeb.h HAVE_SYS_TIMEB_H)
 CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H)
-CHECK_INCLUDE_FILES (sysent.h HAVE_SYSENT_H)
-CHECK_INCLUDE_FILES (termio.h HAVE_TERMIO_H)
-CHECK_INCLUDE_FILES (termios.h HAVE_TERMIOS_H)
 CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
 CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H)
 CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H)

cmake/CheckTypes.cmake

@@ -12,17 +12,14 @@
 INCLUDE (CheckTypeSize)
 
 SET(CMAKE_EXTRA_INCLUDE_FILES signal.h)
-CHECK_TYPE_SIZE(sigset_t SIZEOF_SIGSET_T)
-CHECK_TYPE_SIZE(char SIZEOF_CHAR)
+
 CHECK_TYPE_SIZE("char *" SIZEOF_CHARP)
-CHECK_TYPE_SIZE(short SIZEOF_SHORT)
 CHECK_TYPE_SIZE(int SIZEOF_INT)
 CHECK_TYPE_SIZE(long SIZEOF_LONG)
 CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
 SET(CMAKE_EXTRA_INCLUDE_FILES stdio.h)
 CHECK_TYPE_SIZE(size_t SIZEOF_SIZE_T)
 SET(CMAKE_EXTRA_INCLUDE_FILES sys/types.h)
-CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T)
 CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR)
 CHECK_TYPE_SIZE(uint SIZEOF_UINT)
 CHECK_TYPE_SIZE(ulong SIZEOF_ULONG)
@@ -32,7 +29,6 @@ CHECK_TYPE_SIZE(int16 SIZEOF_INT16)
 CHECK_TYPE_SIZE(uint16 SIZEOF_UINT16)
 CHECK_TYPE_SIZE(int32 SIZEOF_INT32)
 CHECK_TYPE_SIZE(uint32 SIZEOF_UINT32)
-CHECK_TYPE_SIZE(u_int32_t SIZEOF_UINT_32_T)
 CHECK_TYPE_SIZE(int64 SIZEOF_INT64)
 CHECK_TYPE_SIZE(uint64 SIZEOF_UINT64)
 CHECK_TYPE_SIZE(socklen_t SIZEOF_SOCKLEN_T)
@@ -42,53 +38,6 @@ CHECK_TYPE_SIZE(socklen_t SIZEOF_SOCKLEN_T)
 #
 INCLUDE (CheckCSourceCompiles)
 
-#
-# signal handler
-#
-CHECK_C_SOURCE_COMPILES("
-  #include <signal.h>
-
-  #ifdef signal
-  #undef signal
-  #endif
-
-  #ifdef __cplusplus
-    extern \"C\" void (*signal (int, void (*)(int)))(int);
-  #else
-  void (*signal ()) ();
-  #endif
-
-  int main(int ac, char **av) 
-  {
-  }"
-  IS_VOID_SIGNAL)
-
-IF(IS_VOID_SIGNAL)
-  SET(RETSIGTYPE "void")
-ELSE(IS_VOID_SIGNAL)
-  SET(RETSIGTYPE "int")
-ENDIF(IS_VOID_SIGNAL)
-
-#
-# quick sort
-#
-CHECK_C_SOURCE_COMPILES("
-  #include <stdlib.h>
-  #ifdef __cplusplus
-    extern \"C\" void qsort(void *base, size_t nel, size_t width, int (*compar) (const void *, const void *));
-  #else
-    void qsort(void *base, size_t nel, size_t width, int (*compar) (const void *, const void *));
-  #endif
-  int main(int ac, char **av)
-  {
-  }"
-  IS_VOID_QSORT)
-IF(IS_VOID_QSORT)
-  SET(RETQSORTTYPE "void")
-ELSE(IS_VOID_QSORT)
-  SET(RETQSORTTYPE "int")
-ENDIF(IS_VOID_QSORT)
-
 #
 # SOCKET_SIZE 
 #

cmake/install.cmake

@@ -71,12 +71,12 @@ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
 # RPM layout
 #
 SET(INSTALL_BINDIR_RPM "bin")
-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET(INSTALL_LIBDIR_RPM "lib64/mariadb")
   SET(INSTALL_PCDIR_RPM "lib64/pkgconfig")
   SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin")
 ELSE()
-  SET(INSTALL_LIBDIR_RPM "lib")
+  SET(INSTALL_LIBDIR_RPM "lib/mariadb")
   SET(INSTALL_PCDIR_RPM "lib/pkgconfig")
   SET(INSTALL_PLUGINDIR_RPM "lib/mariadb/plugin")
 ENDIF()

include/ma_common.h

@@ -31,6 +31,13 @@ enum enum_multi_status {
   COM_MULTI_END
 };
 
+
+typedef enum {
+  ALWAYS_ACCEPT,       /* heuristics is disabled, use CLIENT_LOCAL_FILES */
+  WAIT_FOR_QUERY,      /* heuristics is enabled, not sending files */
+  ACCEPT_FILE_REQUEST  /* heuristics is enabled, ready to send a file */
+} auto_local_infile_state;
+
 typedef struct st_mariadb_db_driver
 {
   struct st_mariadb_client_plugin_DB *plugin;
@@ -97,6 +104,7 @@ struct st_mariadb_extension {
   struct st_mariadb_session_state session_state[SESSION_TRACK_TYPES];
   unsigned long mariadb_client_flag; /* MariaDB specific client flags */
   unsigned long mariadb_server_capabilities; /* MariaDB specific server capabilities */
+  my_bool auto_local_infile;
 };
 
 #define OPT_EXT_VAL(a,key) \