Merge 10.6 into 10.7

Author: grooverdan

debian/autobake-deb.sh

@@ -52,39 +52,82 @@ remove_rocksdb_tools()
   fi
 }
 
-CODENAME="$(lsb_release -sc)"
-case "${CODENAME}" in
-	stretch)
-		# MDEV-28022 libzstd-dev-1.1.3 minimum version
-		sed -i -e '/libzstd-dev/d' \
-                       -e 's/libcurl4/libcurl3/g' -i debian/control
-		remove_rocksdb_tools
-		;;
-	bionic)
-		remove_rocksdb_tools
-		;;
-esac
-
-if [[ ! "$(dpkg-architecture -q DEB_BUILD_ARCH)" =~ amd64|arm64|ppc64el|s390x ]]
-then
-  remove_rocksdb_tools
-fi
-
-# From Debian Bullseye/Ubuntu Groovy, liburing replaces libaio
-if ! apt-cache madison liburing-dev | grep 'liburing-dev' >/dev/null 2>&1
-then
+replace_uring_with_aio()
+{
   sed 's/liburing-dev/libaio-dev/g' -i debian/control
-  sed '/-DIGNORE_AIO_CHECK=YES/d' -i debian/rules
-  sed '/-DWITH_URING=yes/d' -i debian/rules
-fi
+  sed -e '/-DIGNORE_AIO_CHECK=YES/d' \
+      -e '/-DWITH_URING=yes/d' -i debian/rules
+}
 
-# From Debian Buster/Ubuntu Focal onwards libpmem-dev is available
-# Don't reference it when built in distro releases that lack it
-if ! apt-cache madison libpmem-dev | grep 'libpmem-dev' >/dev/null 2>&1
-then
+disable_pmem()
+{
   sed '/libpmem-dev/d' -i debian/control
   sed '/-DWITH_PMEM=yes/d' -i debian/rules
-fi
+}
+
+architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
+
+CODENAME="$(lsb_release -sc)"
+case "${CODENAME}" in
+  stretch)
+    # MDEV-16525 libzstd-dev-1.1.3 minimum version
+    sed -e '/libzstd-dev/d' \
+        -e 's/libcurl4/libcurl3/g' -i debian/control
+    remove_rocksdb_tools
+    disable_pmem
+    ;&
+  buster)
+    replace_uring_with_aio
+    if [ ! "$architecture" = amd64 ]
+    then
+      disable_pmem
+    fi
+    ;&
+  bullseye|bookworm)
+    # mariadb-plugin-rocksdb in control is 4 arches covered by the distro rocksdb-tools
+    # so no removal is necessary.
+    if [[ ! "$architecture" =~ amd64|arm64|ppc64el ]]
+    then
+      disable_pmem
+    fi
+    if [[ ! "$architecture" =~ amd64|arm64|armel|armhf|i386|mips64el|mipsel|ppc64el|s390x ]]
+    then
+      replace_uring_with_aio
+    fi
+    ;&
+  sid)
+    # should always be empty here.
+    # need to match here to avoid the default Error however
+    ;;
+    # UBUNTU
+  bionic)
+    remove_rocksdb_tools
+    [ "$architecture" != amd64 ] && disable_pmem
+    ;&
+  focal)
+    replace_uring_with_aio
+    ;&
+  impish|jammy)
+    # mariadb-plugin-rocksdb s390x not supported by us (yet)
+    # ubuntu doesn't support mips64el yet, so keep this just
+    # in case something changes.
+    if [[ ! "$architecture" =~ amd64|arm64|ppc64el|s390x ]]
+    then
+      remove_rocksdb_tools
+    fi
+    if [[ ! "$architecture" =~ amd64|arm64|ppc64el ]]
+    then
+      disable_pmem
+    fi
+    if [[ ! "$architecture" =~ amd64|arm64|armhf|ppc64el|s390x ]]
+    then
+      replace_uring_with_aio
+    fi
+    ;;
+  *)
+    echo "Error - unknown release codename $CODENAME" >&2
+    exit 1
+esac
 
 # Adjust changelog, add new version
 echo "Incrementing changelog and starting build scripts"

debian/control

@@ -34,7 +34,7 @@ Build-Depends: bison,
                libnuma-dev [linux-any],
                libpam0g-dev,
                libpcre2-dev,
-               libpmem-dev [amd64 arm64 ppc64el],
+               libpmem-dev [amd64 arm64 ppc64el riscv64],
                libsnappy-dev,
                libssl-dev,
                libssl-dev:native,

debian/mariadb-plugin-columnstore.install

@@ -0,0 +1,119 @@
+etc/columnstore/Columnstore.xml
+etc/columnstore/ErrorMessage.txt
+etc/columnstore/MessageFile.txt
+etc/columnstore/storagemanager.cnf
+etc/mysql/mariadb.conf.d/columnstore.cnf
+usr/bin/mcsRebuildEM
+usr/bin/DDLProc
+usr/bin/DMLProc
+usr/bin/ExeMgr
+usr/bin/PrimProc
+usr/bin/StorageManager
+usr/bin/WriteEngineServer
+usr/bin/clearShm
+usr/bin/cleartablelock
+usr/bin/columnstore-post-install
+usr/bin/columnstore-pre-uninstall
+usr/bin/columnstoreDBWrite
+usr/bin/columnstoreSyslogSetup.sh
+usr/bin/columnstore_run.sh
+usr/bin/colxml
+usr/bin/controllernode
+usr/bin/cpimport
+usr/bin/cpimport.bin
+usr/bin/cplogger
+usr/bin/cspasswd
+usr/bin/cskeys
+usr/bin/dbbuilder
+usr/bin/dbrmctl
+usr/bin/ddlcleanup
+usr/bin/editem
+usr/bin/idbmeminfo
+usr/bin/load_brm
+usr/bin/mariadb-columnstore-start.sh
+usr/bin/mariadb-columnstore-stop.sh
+usr/bin/mcs-savebrm.py
+usr/bin/mcs-loadbrm.py
+usr/bin/mcs-stop-controllernode.sh
+usr/bin/mcsGetConfig
+usr/bin/mcsSetConfig
+usr/bin/mycnfUpgrade
+usr/bin/post-mysql-install
+usr/bin/post-mysqld-install
+usr/bin/reset_locks
+usr/bin/rollback
+usr/bin/save_brm
+usr/bin/smcat
+usr/bin/smls
+usr/bin/smput
+usr/bin/smrm
+usr/bin/testS3Connection
+usr/bin/viewtablelock
+usr/bin/workernode
+usr/lib/*/libbatchloader.so
+usr/lib/*/libbrm.so
+usr/lib/*/libcacheutils.so
+usr/lib/*/libcloudio.so
+usr/lib/*/libcommon.so
+usr/lib/*/libcompress.so
+usr/lib/*/libconfigcpp.so
+usr/lib/*/libdataconvert.so
+usr/lib/*/libddlcleanuputil.so
+usr/lib/*/libddlpackage.so
+usr/lib/*/libddlpackageproc.so
+usr/lib/*/libdmlpackage.so
+usr/lib/*/libdmlpackageproc.so
+usr/lib/*/libexecplan.so
+usr/lib/*/libfuncexp.so
+usr/lib/*/libidbdatafile.so
+usr/lib/*/libjoblist.so
+usr/lib/*/libjoiner.so
+usr/lib/*/liblibmysql_client.so
+usr/lib/*/libloggingcpp.so
+usr/lib/*/libmarias3.so
+usr/lib/*/libmessageqcpp.so
+usr/lib/*/liboamcpp.so
+usr/lib/*/libquerystats.so
+usr/lib/*/libquerytele.so
+usr/lib/*/libregr.so
+usr/lib/*/librowgroup.so
+usr/lib/*/librwlock.so
+usr/lib/*/libstoragemanager.so
+usr/lib/*/libthreadpool.so
+usr/lib/*/libthrift.so
+usr/lib/*/libudfsdk.so
+usr/lib/*/libwindowfunction.so
+usr/lib/*/libwriteengine.so
+usr/lib/*/libwriteengineclient.so
+usr/lib/*/libwriteengineredistribute.so
+usr/lib/*/libdatatypes.so
+usr/lib/mysql/plugin/ha_columnstore.so
+usr/lib/mysql/plugin/libregr_mysql.so
+usr/lib/mysql/plugin/libudf_mysql.so
+usr/sbin/install_mcs_mysql.sh
+usr/share/columnstore/calremoveuserpriority.sql
+usr/share/columnstore/calsetuserpriority.sql
+usr/share/columnstore/calshowprocesslist.sql
+usr/share/columnstore/columnstoreAlias
+usr/share/columnstore/columnstoreLogRotate
+usr/share/columnstore/columnstoreSyslog
+usr/share/columnstore/columnstoreSyslog-ng
+usr/share/columnstore/columnstoreSyslog7
+usr/share/columnstore/columnstore_info.sql
+usr/share/columnstore/dumpcat_mysql.sql
+usr/share/columnstore/gitversionEngine
+usr/share/columnstore/mariadb-columnstore.service
+usr/share/columnstore/mcs-controllernode.service
+usr/share/columnstore/mcs-ddlproc.service
+usr/share/columnstore/mcs-dmlproc.service
+usr/share/columnstore/mcs-exemgr.service
+usr/share/columnstore/mcs-loadbrm.service
+usr/share/columnstore/mcs-primproc.service
+usr/share/columnstore/mcs-storagemanager.service
+usr/share/columnstore/mcs-workernode.service
+usr/share/columnstore/mcs-writeengineserver.service
+usr/share/columnstore/myCnf-exclude-args.text
+usr/share/columnstore/myCnf-include-args.text
+usr/share/columnstore/releasenum
+usr/share/columnstore/syscatalog_mysql.sql
+var/lib/columnstore/local/module

debian/mariadb-plugin-columnstore.postinst

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# Install ColumnStore
+columnstore-post-install install
+
+#DEBHELPER#

debian/mariadb-plugin-columnstore.postrm

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+if [ "$1" = "purge" ]; then
+    rm -rf /var/lib/columnstore
+    rm -rf /etc/columnstore
+    rm -f /etc/mysql/mariadb.conf.d/columnstore.cnf.rpmsave
+fi
+
+# Automatically restart MariaDB after ColumnStore plugin has been removed
+case "$1" in
+  purge|remove|disappear)
+    if [ -d /run/systemd/system ]; then
+      # If systemd
+      deb-systemd-invoke restart mariadb.service >/dev/null
+    elif [ -x "/etc/init.d/mariadb" ]; then
+      # Fall-back to SysV init
+      invoke-rc.d mariadb restart || exit $?
+    fi
+  ;;
+esac
+
+#DEBHELPER#

debian/mariadb-plugin-columnstore.prerm

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+columnstore-pre-uninstall
+
+
+#DEBHELPER#

debian/mariadb-plugin-columnstore.triggers

@@ -0,0 +1 @@
+activate-noawait ldconfig

debian/rules

@@ -60,7 +60,7 @@ endif
 
 # Only attempt to build with PMEM on archs that have package libpmem-dev available
 # See https://packages.debian.org/search?searchon=names&keywords=libpmem-dev
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64 ppc64el))
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64 ppc64el riscv64))
 		CMAKEFLAGS += -DWITH_PMEM=yes
 endif
 

debian/source/lintian-overrides

@@ -23,8 +23,10 @@ version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
 # Must be fixed upstream
-source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-1.8.18.custom.js line 58 is 273 characters long (>256)
+source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-1.8.18.custom.js *
 # Intentional control relationships
 version-substvar-for-external-package Replaces (line 216) ${source:Version} libmariadbd-dev -> libmariadbclient-dev
 version-substvar-for-external-package Replaces (line 66) ${source:Version} libmariadb-dev -> libmysqlclient-dev
 version-substvar-for-external-package Replaces (line 66) ${source:Version} libmariadb-dev -> libmysqld-dev
+# We can't change build dependencies on a stable branch (10.5..10.8) so just override this
+missing-build-dependency-for-dh-addon systemd *

mysql-test/include/have_innodb.inc

@@ -2,3 +2,15 @@
 # suite.pm will make sure that all tests including this file
 # will be skipped unless innodb is enabled
 #
+--disable_query_log
+if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
+{
+SET STATEMENT sql_log_bin=0 FOR
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+}
+if ($VALGRIND_TEST)
+{
+SET STATEMENT sql_log_bin=0 FOR
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+}
+--enable_query_log