Merge 10.5 into 10.6

Author: dr-m

cmake/Internal/CPack/CPackRPM.cmake

@@ -24,6 +24,7 @@ endmacro()
 
 set_from_component(LICENSE)
 set_from_component(VENDOR)
+set_from_component(VERSION)
 
 #
 # Support for the %posttrans scriptlet
@@ -80,6 +81,7 @@ set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
 
 restore(LICENSE)
 restore(VENDOR)
+restore(VERSION)
 if(${orig_${base_var}})
   set(${base_var} ${orig_${base_var}})
 endif()

cmake/cpack_deb.cmake

@@ -7,5 +7,18 @@ SET(CPACK_COMPONENT_SERVER_GROUP "server")
 SET(CPACK_COMPONENT_README_GROUP "server")
 SET(CPACK_COMPONENTS_ALL Server Test SharedLibraries)
 SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")
+
+FUNCTION(SET_PLUGIN_DEB_VERSION plugin ver)
+  STRING(REPLACE "_" "-" plugin ${plugin})
+  STRING(REPLACE "-" "." serverver ${SERVER_VERSION})
+  STRING(REPLACE ${SERVER_VERSION} ${serverver} ver ${ver})
+  FILE(READ ${CMAKE_SOURCE_DIR}/debian/changelog changelog)
+  STRING(REPLACE ${serverver} ${ver} changelog "${changelog}")
+  FILE(WRITE ${CMAKE_SOURCE_DIR}/debian/mariadb-plugin-${plugin}.changelog "${changelog}")
+ENDFUNCTION()
+
+ELSE(DEB)
+FUNCTION(SET_PLUGIN_DEB_VERSION plugin ver)
+ENDFUNCTION()
 ENDIF(DEB)
 

cmake/cpack_rpm.cmake

@@ -33,13 +33,14 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
 )
 
 SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
+SET(CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
 IF(CMAKE_VERSION VERSION_LESS "3.6.0")
-  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
+  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
 ELSE()
   SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
   OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON)
   MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE)
-  SET(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}")
+  SET(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}")
 ENDIF()
 
 SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")

cmake/mysql_version.cmake

@@ -57,6 +57,7 @@ IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
   ENDIF()
 
   SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
+  SET(SERVER_VERSION ${VERSION})
   MESSAGE(STATUS "MariaDB ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")

cmake/plugin.cmake

@@ -28,13 +28,14 @@ INCLUDE(CMakeParseArguments)
 # [STATIC_OUTPUT_NAME static_name]
 # [COMPONENT component]
 # [CONFIG cnf_file_name]
+# [VERSION version_string]
 # [LINK_LIBRARIES lib1...libN]
 # [DEPENDENCIES target1...targetN]
 
 MACRO(MYSQL_ADD_PLUGIN)
   CMAKE_PARSE_ARGUMENTS(ARG
     "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_EMBEDDED;RECOMPILE_FOR_EMBEDDED;CLIENT"
-    "MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG"
+    "MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG;VERSION"
     "LINK_LIBRARIES;DEPENDENCIES"
     ${ARGN}
   )
@@ -117,6 +118,10 @@ MACRO(MYSQL_ADD_PLUGIN)
   IF(NOT ARG_DEPENDENCIES)
     SET(ARG_DEPENDENCIES)
   ENDIF()
+
+  IF(ARG_VERSION)
+    SET(version_string ";PLUGIN_${plugin}_VERSION=\"${ARG_VERSION}\"")
+  ENDIF()
 
   IF(NOT ARG_MODULE_OUTPUT_NAME)
     IF(ARG_STORAGE_ENGINE)
@@ -153,7 +158,7 @@ MACRO(MYSQL_ADD_PLUGIN)
         DTRACE_INSTRUMENT(${target}_embedded)   
         IF(ARG_RECOMPILE_FOR_EMBEDDED)
           SET_TARGET_PROPERTIES(${target}_embedded 
-            PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY")
+            PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY${version_string}")
         ENDIF()
         ADD_DEPENDENCIES(${target}_embedded GenError)
       ENDIF()
@@ -204,7 +209,7 @@ MACRO(MYSQL_ADD_PLUGIN)
     SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "")
     IF (NOT ARG_CLIENT)
       SET_TARGET_PROPERTIES (${target} PROPERTIES
-        COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
+        COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN${version_string}")
     ENDIF()
 
     TARGET_LINK_LIBRARIES (${target} mysqlservices ${ARG_LINK_LIBRARIES})
@@ -240,7 +245,8 @@ MACRO(MYSQL_ADD_PLUGIN)
          NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT}
          AND INSTALL_SYSCONF2DIR)
         IF (ARG_STORAGE_ENGINE)
-          SET(ver " = %{version}-%{release}")
+          STRING(REPLACE "-" "_" ver ${SERVER_VERSION})
+          SET(ver " = ${ver}-%{release}")
         ELSE()
           SET(ver "")
         ENDIF()
@@ -251,6 +257,10 @@ MACRO(MYSQL_ADD_PLUGIN)
           SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server${ver}" PARENT_SCOPE)
         ENDIF()
         SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE)
+        IF (ARG_VERSION)
+          SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_VERSION ${SERVER_VERSION}_${ARG_VERSION} PARENT_SCOPE)
+          SET_PLUGIN_DEB_VERSION(${target} ${SERVER_VERSION}-${ARG_VERSION})
+        ENDIF()
         IF(NOT ARG_CLIENT AND UNIX)
           IF (NOT ARG_CONFIG)
             SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.cnf")

debian/autobake-deb.sh

@@ -91,10 +91,11 @@ PATCHLEVEL="+maria"
 LOGSTRING="MariaDB build"
 CODENAME="$(lsb_release -sc)"
 EPOCH="1:"
+VERSION="${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}"
 
-dch -b -D "${CODENAME}" -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}."
+dch -b -D "${CODENAME}" -v "${VERSION}" "Automatic build with ${LOGSTRING}."
 
-echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... "
+echo "Creating package version ${VERSION} ... "
 
 # On Travis CI and Gitlab-CI, use -b to build binary only packages as there is
 # no need to waste time on generating the source package.

debian/control

@@ -10,18 +10,18 @@ Build-Depends: bison,
                dh-apparmor,
                dh-exec,
                dh-systemd,
-               flex [i386 amd64],
+               flex [amd64],
                gdb,
                libaio-dev [linux-any],
                libarchive-dev,
-               libboost-atomic-dev [i386 amd64],
-               libboost-chrono-dev [i386 amd64],
-               libboost-date-time-dev [i386 amd64],
+               libboost-atomic-dev [amd64],
+               libboost-chrono-dev [amd64],
+               libboost-date-time-dev [amd64],
                libboost-dev,
-               libboost-filesystem-dev [i386 amd64],
-               libboost-regex-dev [i386 amd64],
-               libboost-system-dev [i386 amd64],
-               libboost-thread-dev [i386 amd64],
+               libboost-filesystem-dev [amd64],
+               libboost-regex-dev [amd64],
+               libboost-system-dev [amd64],
+               libboost-thread-dev [amd64],
                libcrack2-dev (>= 2.9.0),
                libcurl4-openssl-dev | libcurl4-dev,
                libedit-dev,
@@ -35,7 +35,7 @@ Build-Depends: bison,
                libnuma-dev [linux-any],
                libpam0g-dev,
                libpcre2-dev,
-               libreadline-gplv2-dev [i386 amd64],
+               libreadline-gplv2-dev [amd64],
                libsnappy-dev,
                libssl-dev,
                libssl-dev:native,
@@ -448,7 +448,7 @@ Depends: galera-4 (>=26.4),
          lsb-base (>= 3.0-10),
          lsof [linux-any],
          mariadb-client-10.6 (>= ${source:Version}),
-         mariadb-server-core-10.6 (>= ${binary:Version}),
+         mariadb-server-core-10.6 (>= ${server:Version}),
          passwd,
          perl (>= 5.6),
          procps,
@@ -554,7 +554,7 @@ Description: Backup tool for MariaDB server
 Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
-         mariadb-server-10.6 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${server:Version}),
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -575,7 +575,7 @@ Description: Connect storage engine for MariaDB
 Package: mariadb-plugin-s3
 Architecture: any
 Depends: libcurl4,
-         mariadb-server-10.6 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Amazon S3 archival storage engine for MariaDB
@@ -585,7 +585,7 @@ Description: Amazon S3 archival storage engine for MariaDB
 
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el
-Depends: mariadb-server-10.6 (= ${binary:Version}),
+Depends: mariadb-server-10.6 (= ${server:Version}),
          python3,
          rocksdb-tools,
          ${misc:Depends},
@@ -605,7 +605,7 @@ Description: RocksDB storage engine for MariaDB
 Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1,
-         mariadb-server-10.6 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-oqgraph-engine-10.1,
@@ -623,7 +623,7 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
-Depends: mariadb-server-10.6 (= ${binary:Version}),
+Depends: mariadb-server-10.6 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -643,7 +643,7 @@ Description: Mroonga storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.6 (= ${binary:Version}),
+Depends: mariadb-server-10.6 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -665,7 +665,7 @@ Description: Spider storage engine for MariaDB
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-server-10.6 (= ${binary:Version}),
+         mariadb-server-10.6,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1,
@@ -706,7 +706,7 @@ Description: GSSAPI authentication plugin for MariaDB client
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
 Depends: libcrack2 (>= 2.9.0),
-         mariadb-server-10.6 (= ${binary:Version}),
+         mariadb-server-10.6,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB
@@ -718,7 +718,7 @@ Description: CrackLib Password Validation Plugin for MariaDB
 Package: mariadb-test
 Architecture: any
 Depends: mariadb-client-10.6 (= ${binary:Version}),
-         mariadb-server-10.6 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${server:Version}),
          mariadb-test-data (= ${source:Version}),
          virtual-mysql-testsuite,
          ${misc:Depends},

debian/rules

@@ -82,6 +82,7 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native
 	dh_auto_build --builddirectory=builddir-native -- import_executables
 endif
+	echo "server:Version=$(DEB_VERSION)" >> debian/substvars
 
 	# Don't build ColumnStore as part of the native build, only build it when
 	# triggered by autobake-deb.sh. Saves build time and disk space.
@@ -186,6 +187,8 @@ override_dh_installinit-arch:
 	dh_installinit --name=mariadb --no-start -- defaults 19 21
 	dh_systemd_start --restart-after-upgrade
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Tdebian/substvars
 
 # If a file is not supposed to be included anywhere, add it to the not-installed
 # file and document the reason. Note that dh_install supports the above mentioned

mysql-test/suite/sys_vars/r/innodb_idle_flush_pct_basic.result

@@ -188,15 +188,6 @@
  VARIABLE_COMMENT	Total memory allocated for InnoDB Fulltext Search cache
  NUMERIC_MIN_VALUE	32000000
  NUMERIC_MAX_VALUE	1600000000
-@@ -1057,7 +1057,7 @@
- SESSION_VALUE	NULL
- DEFAULT_VALUE	100
- VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
- NUMERIC_MIN_VALUE	0
- NUMERIC_MAX_VALUE	100
 @@ -1093,22 +1093,22 @@
  SESSION_VALUE	NULL
  DEFAULT_VALUE	200