Merge 10.5 into 10.6

Author: dr-m

.travis.yml

@@ -41,6 +41,7 @@ addons:
       - g++-10   # In suites: focal, bionic (via ppa:ubuntu-toolchain-r/test)
       - gdb
       - libaio-dev
+      - libarchive-dev
       - libboost-atomic-dev
       - libboost-chrono-dev
       - libboost-date-time-dev
@@ -50,11 +51,12 @@ addons:
       - libboost-system-dev
       - libboost-thread-dev
       - libcrack2-dev
-      - libcurl3-dev
+      - libcurl4-openssl-dev
       - libdbd-mysql
       - libedit-dev
       - libjemalloc-dev
       - libjudy-dev
+      - libkrb5-dev
       - liblz4-dev
       - libncurses5-dev
       - libnuma-dev
@@ -63,7 +65,6 @@ addons:
       - libreadline-gplv2-dev
       - libsnappy-dev
       - libssl-dev
-      - libstemmer-dev
       - libxml2-dev
       - lsb-release
       - perl
@@ -136,7 +137,6 @@ jobs:
             - dh-exec
             - dh-systemd
             - fakeroot
-            - libdistro-info-perl
             - libsystemd-dev
             - libzstd-dev
             - po-debconf

client/mysqlslap.c

@@ -1177,9 +1177,6 @@ get_options(int *argc,char ***argv)
   if (debug_check_flag)
     my_end_arg= MY_CHECK_ERROR;
 
-  if (!user)
-    user= (char *)"root";
-
   /*
     If something is created and --no-drop is not specified, we drop the
     schema.

debian/additions/debian-start

@@ -1,11 +1,10 @@
 #!/bin/bash
 #
-# This script is executed by "/etc/init.d/mariadb" on every (re)start.
+# This script is executed by both SysV init /etc/init.d/mariadb and
+# systemd mariadb.service on every (re)start.
 #
 # Changes to this file will be preserved when updating the Debian package.
 #
-# NOTE: This file is read only by the traditional SysV init script, not systemd.
-#
 
 source /usr/share/mysql/debian-start.inc.sh
 

debian/additions/mariadb.conf.d/50-client.cnf

@@ -5,11 +5,11 @@
 
 [client]
 # Example of client certificate usage
-# ssl-cert = /etc/mysql/client-cert.pem
-# ssl-key = /etc/mysql/client-key.pem
+#ssl-cert = /etc/mysql/client-cert.pem
+#ssl-key  = /etc/mysql/client-key.pem
 #
 # Allow only TLS encrypted connections
-# ssl-verify-server-cert = on
+#ssl-verify-server-cert = on
 
 # This group is *never* read by mysql client library, though this
 # /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL

debian/additions/mariadb.conf.d/50-server.cnf

@@ -82,6 +82,7 @@ expire_logs_days        = 10
 #ssl-ca = /etc/mysql/cacert.pem
 #ssl-cert = /etc/mysql/server-cert.pem
 #ssl-key = /etc/mysql/server-key.pem
+#require-secure-transport = on
 
 #
 # * Character sets

debian/additions/mariadb.conf.d/60-galera.cnf

@@ -6,11 +6,11 @@
 
 [galera]
 # Mandatory settings
-#wsrep_on = ON
-#wsrep_provider =
-#wsrep_cluster_address =
-#binlog_format = row
-#default_storage_engine = InnoDB
+#wsrep_on                 = ON
+#wsrep_cluster_name       = "MariaDB Galera Cluster"
+#wsrep_cluster_address    = gcomm://
+#binlog_format            = row
+#default_storage_engine   = InnoDB
 #innodb_autoinc_lock_mode = 2
 
 # Allow server to accept connections on all interfaces.

debian/control

@@ -5,13 +5,15 @@ Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 Build-Depends: bison,
                chrpath,
                cmake,
+               cracklib-runtime,
                debhelper (>= 9),
                dh-apparmor,
                dh-exec,
                dh-systemd,
                flex [i386 amd64],
                gdb,
                libaio-dev [linux-any],
+               libarchive-dev,
                libboost-atomic-dev [i386 amd64],
                libboost-chrono-dev [i386 amd64],
                libboost-date-time-dev [i386 amd64],
@@ -23,38 +25,41 @@ Build-Depends: bison,
                libcrack2-dev (>= 2.9.0),
                libcurl4-openssl-dev | libcurl4-dev,
                libedit-dev,
+               libedit-dev:native,
                libjemalloc-dev [linux-any],
                libjudy-dev,
                libkrb5-dev,
                liblz4-dev,
                libncurses5-dev (>= 5.0-6~),
-               libnuma-dev [!armhf],
+               libncurses5-dev:native (>= 5.0-6~),
+               libnuma-dev [linux-any],
                libpam0g-dev,
                libpcre2-dev,
                libreadline-gplv2-dev [i386 amd64],
                libsnappy-dev,
-               libssl-dev | libssl1.0-dev,
+               libssl-dev,
+               libssl-dev:native,
                libsystemd-dev [linux-any],
                libxml2-dev,
                libzstd-dev,
                lsb-release,
-               perl,
+               perl:any,
                po-debconf,
                psmisc,
                unixodbc-dev,
                uuid-dev,
                zlib1g-dev (>= 1:1.1.3-5~)
 Rules-Requires-Root: no
-Standards-Version: 3.8.2
+Standards-Version: 4.5.0
 Homepage: https://mariadb.org/
 Vcs-Browser: https://github.com/MariaDB/server/
 Vcs-Git: https://github.com/MariaDB/server.git
 
 Package: libmariadb-dev
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Depends: libmariadb3 (= ${binary:Version}),
+         libssl-dev,
          zlib1g-dev,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -188,12 +193,12 @@ Description: Virtual package to satisfy external libmysqlclient18 depends
 
 Package: libmariadbd19
 Architecture: any
-Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libmariadbd-dev (<< ${source:Version})
 Replaces: libmariadbd-dev (<< ${source:Version})
+Multi-Arch: same
 Description: MariaDB embedded database, shared library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -204,7 +209,6 @@ Description: MariaDB embedded database, shared library
 
 Package: libmariadbd-dev
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Provides: libmysqld-dev
 Pre-Depends: ${misc:Pre-Depends}
@@ -241,6 +245,7 @@ Package: mariadb-common
 Architecture: all
 Depends: mysql-common (>= 5.6.25),
          ${misc:Depends}
+Multi-Arch: foreign
 Description: MariaDB common configuration files
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -679,6 +684,7 @@ Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-plugin-gssapi-client
 Architecture: any
+Multi-Arch: same
 Depends: libgssapi-krb5-2,
          mariadb-client-10.6 (= ${binary:Version}),
          ${misc:Depends},

debian/mariadb-common.postinst

@@ -23,6 +23,18 @@ case "$1" in
         echo "  ln -sf mariadb.cnf /etc/mysql/my.cnf"
       fi
     fi
+
+    # Note that MySQL in Debian runs the configure-symlinks from the
+    # mysql-server-x.x.postinst and postrm files, while the MySQL.com (and
+    # Percona.com) packaging triggers update-alternatives directly form the
+    # mysql-common (and percona-x-common) package using priority 200.
+    #
+    # Thus, we need to ensure here that mariadb.cnf indeed became the primary
+    # alternative and override with priority 500 if needed.
+    if ! update-alternatives --query my.cnf | grep --quiet "Value: /etc/mysql/mariadb.cnf"
+    then
+      update-alternatives --install /etc/mysql/my.cnf my.cnf "/etc/mysql/mariadb.cnf" 500 || true
+    fi
   ;;
 esac