Merge 10.5 into 10.6

MariaDB · Aug 12, 2020 · 0e34bb3 · 0e34bb3
2 parents 1ddff75 + 602d3da
commit 0e34bb3
Show file tree

Hide file tree

Showing 235 changed files with 6,381 additions and 1,996 deletions.
diff --git a/cmake/Internal/CPack/CPackRPM.cmake b/cmake/Internal/CPack/CPackRPM.cmake
@@ -2,6 +2,11 @@
 # Wrapper for CPackRPM.cmake
 #
 
+IF(NOT DEFINED RPM_RECOMMENDS)
+  EXECUTE_PROCESS(COMMAND rpm --recommends ERROR_QUIET RESULT_VARIABLE RPM_RECOMMENDS)
+  MESSAGE("CPackRPM:Debug: Testing rpm --recommends: ${RPM_RECOMMENDS}")
+ENDIF()
+
 #
 # Support for per-component LICENSE and VENDOR
 #
@@ -47,6 +52,20 @@ if (acc)
   file(WRITE ${${base_var}} "${acc}")
 endif()
 
+#
+# Support for the Recommends: tag.
+# We don't use Suggests: so here he hijack Suggests: variable
+# to implement Recommends:
+#
+IF (CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_RECOMMENDS)
+  IF (RPM_RECOMMENDS EQUAL 0) # exit code 0 means ok
+    SET(TMP_RPM_SUGGESTS "Recommends: ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_RECOMMENDS}")
+  ELSE() # rpm is too old to recommend
+    SET(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_REQUIRES
+     "${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_REQUIRES} ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_RECOMMENDS}")
+  ENDIF()
+ENDIF()
+
 # load the original CPackRPM.cmake
 set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
 unset(CMAKE_MODULE_PATH)

diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
@@ -30,7 +30,6 @@ SET(HAVE_BACKTRACE_SYMBOLS CACHE  INTERNAL "")
 SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE  INTERNAL "")
 SET(HAVE_BFILL CACHE  INTERNAL "")
 SET(HAVE_BSD_SIGNALS CACHE  INTERNAL "")
-SET(HAVE_BSS_START CACHE  INTERNAL "")
 SET(HAVE_CLOCK_GETTIME CACHE  INTERNAL "")
 SET(HAVE_COMPRESS CACHE  INTERNAL "")
 SET(HAVE_CRYPT CACHE  INTERNAL "")

diff --git a/config.h.cmake b/config.h.cmake
@@ -242,7 +242,6 @@
 /* Symbols we may use */
 #cmakedefine HAVE_SYS_ERRLIST 1
 /* used by stacktrace functions */
-#cmakedefine HAVE_BSS_START 1
 #cmakedefine HAVE_BACKTRACE 1
 #cmakedefine HAVE_BACKTRACE_SYMBOLS 1
 #cmakedefine HAVE_BACKTRACE_SYMBOLS_FD 1

diff --git a/configure.cmake b/configure.cmake
@@ -795,14 +795,6 @@ CHECK_CXX_SOURCE_COMPILES("
   HAVE_ABI_CXA_DEMANGLE)
 ENDIF()
 
-CHECK_C_SOURCE_COMPILES("
-  int main(int argc, char **argv) 
-  {
-    extern char *__bss_start;
-    return __bss_start ? 1 : 0;
-  }"
-HAVE_BSS_START)
-
 CHECK_C_SOURCE_COMPILES("
     int main()
     {

diff --git a/debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset b/debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
@@ -50,12 +50,10 @@ then
   sed "/Package: libmariadbd-dev/,/^$/d" -i debian/control
 fi
 
-# Convert gcc version to numberical value. Format is Mmmpp where M is Major
-# version, mm is minor version and p is patch.
-# -dumpfullversion & -dumpversion to make it uniform across old and new (>=7)
-GCCVERSION=$(gcc -dumpfullversion -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' \
-                                                     -e 's/\.\([0-9]\)/0\1/g'     \
-                                                     -e 's/^[0-9]\{3,4\}$/&00/')
+if [[ $(arch) =~ i[346]86 ]]
+then
+  sed "/Package: mariadb-plugin-rocksdb/,/^$/d" -i debian/control
+fi
 
 # If rocksdb-tools is not available (before Debian Buster and Ubuntu Disco)
 # remove the dependency from the RocksDB plugin so it can install properly

diff --git a/debian/control b/debian/control
@@ -31,6 +31,7 @@ Build-Depends: bison,
                libnuma-dev [!armhf],
                libpam0g-dev,
                libpcre2-dev,
+               libreadline-gplv2-dev [i386 amd64],
                libsnappy-dev,
                libssl-dev | libssl1.0-dev,
                libsystemd-dev [linux-any],
@@ -277,37 +278,23 @@ Conflicts: mariadb-client-10.0,
            mysql-client (<< 5.0.51),
            mysql-client-5.0,
            mysql-client-5.1,
-           mysql-client-5.5 (<< ${source:Version}),
+           mysql-client-5.5,
            mysql-client-core-5.1,
            mysql-client-core-5.5,
            mysql-client-core-5.6,
            mysql-client-core-5.7,
            mysql-client-core-8.0,
            virtual-mysql-client-core
-Replaces: mariadb-client-10.0,
-          mariadb-client-10.1,
-          mariadb-client-10.2,
-          mariadb-client-10.3,
-          mariadb-client-10.4,
-          mariadb-client-10.5,
-          mariadb-client-10.6 (<< ${source:Version}),
-          mariadb-client-5.1,
-          mariadb-client-5.2,
-          mariadb-client-5.3,
-          mariadb-client-5.5,
+Replaces: mariadb-client-core-5.1,
+          mariadb-client-core-5.2,
+          mariadb-client-core-5.3,
+          mariadb-client-core-5.5,
           mariadb-client-core-10.0,
           mariadb-client-core-10.1,
           mariadb-client-core-10.2,
           mariadb-client-core-10.3,
           mariadb-client-core-10.4,
-          mariadb-client-core-5.1,
-          mariadb-client-core-5.2,
-          mariadb-client-core-5.3,
-          mariadb-client-core-5.5,
-          mysql-client (<< 5.0.51),
-          mysql-client-5.0,
-          mysql-client-5.1,
-          mysql-client-5.5,
+          mariadb-client-core-10.5,
           mysql-client-core-5.1,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
@@ -352,54 +339,29 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-5.7,
            mysql-client-8.0,
            mysql-client-core-5.0,
-           mysql-client-core-5.1 (<< ${source:Version}),
-           mysql-client-core-5.5 (<< ${source:Version}),
-           mysql-client-core-5.6 (<< ${source:Version}),
-           mysql-client-core-5.7 (<< ${source:Version}),
-           mysql-client-core-8.0 (<< ${source:Version}),
+           mysql-client-core-5.1,
+           mysql-client-core-5.5,
+           mysql-client-core-5.6,
+           mysql-client-core-5.7,
+           mysql-client-core-8.0,
            mytop,
            virtual-mysql-client
-Breaks: mariadb-client-core-10.0,
-        mariadb-client-core-10.1,
-        mariadb-client-core-10.2,
-        mariadb-client-core-10.3,
-        mariadb-client-core-10.4,
-        mariadb-client-core-10.5,
-        mariadb-client-core-10.6 (<< ${source:Version})
-Replaces: mariadb-client (<< ${source:Version}),
+Replaces: mariadb-client-5.1,
+          mariadb-client-5.2,
+          mariadb-client-5.3,
+          mariadb-client-5.5,
           mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-10.2,
           mariadb-client-10.3,
           mariadb-client-10.4,
           mariadb-client-10.5,
-          mariadb-client-10.6 (<< ${source:Version}),
-          mariadb-client-5.1,
-          mariadb-client-5.2,
-          mariadb-client-5.3,
-          mariadb-client-5.5,
-          mariadb-client-core-10.0,
-          mariadb-client-core-10.1,
-          mariadb-client-core-10.2,
-          mariadb-client-core-10.3,
-          mariadb-client-core-10.4,
-          mariadb-client-core-10.5,
-          mariadb-client-core-10.6 (<< ${source:Version}),
-          mariadb-server-10.5,
-          mariadb-server-10.6 (<< ${source:Version}),
-          mysql-client (<< 5.0.51),
           mysql-client-5.0,
           mysql-client-5.1,
           mysql-client-5.5,
           mysql-client-5.6,
           mysql-client-5.7,
           mysql-client-8.0,
-          mysql-client-core-5.0,
-          mysql-client-core-5.1 (<< ${source:Version}),
-          mysql-client-core-5.5 (<< ${source:Version}),
-          mysql-client-core-5.6 (<< ${source:Version}),
-          mysql-client-core-5.7 (<< ${source:Version}),
-          mysql-client-core-8.0 (<< ${source:Version}),
           mytop,
           virtual-mysql-client
 Provides: default-mysql-client,
@@ -438,44 +400,16 @@ Conflicts: mariadb-server-core-10.0,
            mysql-server-core-5.7,
            mysql-server-core-8.0,
            virtual-mysql-server-core
-Breaks: mariadb-client-10.0,
-        mariadb-client-10.1,
-        mariadb-client-10.2,
-        mariadb-client-10.3,
-        mariadb-client-10.4,
-        mariadb-client-10.5,
-        mariadb-client-10.6 (<< ${source:Version}),
-        mariadb-server-10.3,
-        mariadb-server-10.4,
-        mariadb-server-10.5,
-        mariadb-server-10.6 (<< ${source:Version}),
-        mysql-server-5.6,
-        mysql-server-5.7,
-        mysql-server-8.0
-Replaces: mariadb-client-10.0,
-          mariadb-client-10.1,
-          mariadb-client-10.2,
-          mariadb-client-10.3,
-          mariadb-client-10.4,
-          mariadb-client-10.5,
-          mariadb-client-10.6 (<< ${source:Version}),
-          mariadb-server-10.3,
-          mariadb-server-10.4,
-          mariadb-server-10.5,
-          mariadb-server-10.6 (<< ${source:Version}),
+Replaces: mariadb-server-core-5.1,
+          mariadb-server-core-5.2,
+          mariadb-server-core-5.3,
+          mariadb-server-core-5.5,
           mariadb-server-core-10.0,
           mariadb-server-core-10.1,
           mariadb-server-core-10.2,
           mariadb-server-core-10.3,
           mariadb-server-core-10.4,
-          mariadb-server-core-5.1,
-          mariadb-server-core-5.2,
-          mariadb-server-core-5.3,
-          mariadb-server-core-5.5,
-          mysql-server-5.0,
-          mysql-server-5.6,
-          mysql-server-5.7,
-          mysql-server-8.0,
+          mariadb-server-core-10.5,
           mysql-server-core-5.0,
           mysql-server-core-5.1,
           mysql-server-core-5.5,
@@ -529,11 +463,11 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-5.2,
            mariadb-server-5.3,
            mariadb-server-5.5,
-           mysql-client-5.5 (<< ${source:Version}),
-           mysql-client-5.6 (<< ${source:Version}),
-           mysql-client-5.7 (<< ${source:Version}),
-           mysql-client-8.0 (<< ${source:Version}),
-           mysql-server (<< ${source:Version}),
+           mysql-client-5.5,
+           mysql-client-5.6,
+           mysql-client-5.7,
+           mysql-client-8.0,
+           mysql-server,
            mysql-server-4.1,
            mysql-server-5.0,
            mysql-server-5.1,
@@ -542,25 +476,16 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mysql-server-5.7,
            mysql-server-8.0,
            virtual-mysql-server
-Replaces: libmariadbclient-dev (<< 5.5.0),
-          libmariadbclient16,
-          mariadb-client-10.5,
-          mariadb-client-10.6 (<< ${source:Version}),
-          mariadb-server (<< ${source:Version}),
+Replaces: mariadb-server-5.1,
+          mariadb-server-5.2,
+          mariadb-server-5.3,
+          mariadb-server-5.5,
           mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
           mariadb-server-10.3,
           mariadb-server-10.4,
-          mariadb-server-5.1,
-          mariadb-server-5.2,
-          mariadb-server-5.3,
-          mariadb-server-5.5,
-          mysql-client-5.5 (<< ${source:Version}),
-          mysql-client-5.6 (<< ${source:Version}),
-          mysql-client-5.7 (<< ${source:Version}),
-          mysql-client-8.0 (<< ${source:Version}),
-          mysql-server (<< ${source:Version}),
+          mariadb-server-10.5,
           mysql-server-4.1,
           mysql-server-5.0,
           mysql-server-5.1,
@@ -812,32 +737,18 @@ Depends: mariadb-client-10.6 (= ${binary:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-server-5.5,
+Breaks: mariadb-test-5.5,
         mariadb-test-10.0,
         mariadb-test-10.1,
         mariadb-test-10.2,
         mariadb-test-10.3,
         mariadb-test-10.4,
-        mariadb-test-5.5,
-        mysql-server-5.7,
-        mysql-testsuite,
-        mysql-testsuite-5.5,
-        mysql-testsuite-5.6,
-        mysql-testsuite-5.7,
-        mysql-testsuite-8.0
-Replaces: mariadb-server-5.5,
+Replaces: mariadb-test-5.5,
           mariadb-test-10.0,
           mariadb-test-10.1,
           mariadb-test-10.2,
           mariadb-test-10.3,
           mariadb-test-10.4,
-          mariadb-test-5.5,
-          mysql-server-5.7,
-          mysql-testsuite,
-          mysql-testsuite-5.5,
-          mysql-testsuite-5.6,
-          mysql-testsuite-5.7,
-          mysql-testsuite-8.0,
           virtual-mysql-testsuite
 Provides: virtual-mysql-testsuite
 Suggests: patch
@@ -855,21 +766,23 @@ Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-test-10.0,
-        mariadb-test-10.1,
-        mariadb-test-10.2,
-        mariadb-test-5.5,
+Breaks: mariadb-test-data-5.5,
         mariadb-test-data-10.0,
+        mariadb-test-data-10.1,
+        mariadb-test-data-10.2,
+        mariadb-test-data-10.3,
+        mariadb-test-data-10.4,
         mysql-testsuite,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
         mysql-testsuite-5.7,
         mysql-testsuite-8.0
-Replaces: mariadb-test-10.0,
-          mariadb-test-10.1,
-          mariadb-test-10.2,
-          mariadb-test-5.5,
+Replaces: mariadb-test-data-5.5,
           mariadb-test-data-10.0,
+          mariadb-test-data-10.1,
+          mariadb-test-data-10.2,
+          mariadb-test-data-10.3,
+          mariadb-test-data-10.4,
           mysql-testsuite,
           mysql-testsuite-5.5,
           mysql-testsuite-5.6,

diff --git a/debian/mariadb-server-10.6.install b/debian/mariadb-server-10.6.install
@@ -3,6 +3,7 @@ debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
 debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
+support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
 debian/additions/source_mariadb-10.6.py usr/share/apport/package-hooks
 etc/apparmor.d/usr.sbin.mariadbd
 etc/security/user_map.conf

diff --git a/debian/rules b/debian/rules
@@ -45,7 +45,7 @@ endif
 
 # RocksDB cannot build on 32-bit platforms
 ifeq (32,$(DEB_HOST_ARCH_BITS))
-    CMAKEFLAGS += -DWITHOUT_ROCKSDB=true
+    CMAKEFLAGS += -DPLUGIN_ROCKSDB=NO
 endif
 
 # ColumnStore only attempts to build on a few platforms as dictated by CMake checks

diff --git a/include/violite.h b/include/violite.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
-   Copyright (c) 2012, 2017, MariaDB Corporation.
+   Copyright (c) 2012, 2020, MariaDB Corporation.
 
    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
@@ -278,6 +278,7 @@ struct st_vio
 #ifdef _WIN32
   HANDLE hPipe;
   OVERLAPPED overlapped;
+  int shutdown_flag;
   void *tp_ctx; /* threadpool context */
 #endif
 };