Merge branch 'github/10.3' into bb-10.3-temporalmariadb-10.3.4

37 files changed, 387 insertions, 151 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index cc5b04188f4..fca3482e64b 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -33,7 +33,7 @@ fi
 # Look up distro-version specific stuff
 #
 # Always keep the actual packaging as up-to-date as possible following the latest
-# Debian policy and targetting Debian Sid. Then case-by-case run in autobake-deb.sh
+# Debian policy and targeting Debian Sid. Then case-by-case run in autobake-deb.sh
 # tests for backwards compatibility and strip away parts on older builders.
 
 # If iproute2 is not available (before Debian Jessie and Ubuntu Trusty)
@@ -82,11 +82,20 @@ if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] || [[ $TRAVIS ]]
 then
   sed '/Package: mariadb-plugin-rocksdb/,+13d' -i debian/control
 fi
+
+# AWS SDK requires c++11 -capable compiler
+# Minimal supported versions are g++ 4.8 and clang 3.3.
 if [[ $GCCVERSION -lt 40800 ]] || [[ $TRAVIS ]]
 then
-  sed '/Package: mariadb-plugin-aws-key-management-10.3/,+15d' -i debian/control
+  sed '/Package: mariadb-plugin-aws-key-management/,+14d' -i debian/control
 fi
 
+# Mroonga, TokuDB never built on Travis CI anyway, see build flags above
+if [[ $TRAVIS ]]
+then
+  sed -i -e "/Package: mariadb-plugin-tokudb/,+17d" debian/control
+  sed -i -e "/Package: mariadb-plugin-mroonga/,+16d" debian/control
+fi
 
 # Adjust changelog, add new version
 echo "Incrementing changelog and starting build scripts"
@@ -102,12 +111,20 @@ dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build
 
 echo "Creating package version ${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... "
 
+# On Travis CI, use -b to build binary only packages as there is no need to
+# waste time on generating the source package.
+if [[ $TRAVIS ]]
+then
+  BUILDPACKAGE_FLAGS="-b"
+fi
+
 # Build the package
 # Pass -I so that .git and other unnecessary temporary and source control files
 # will be ignored by dpkg-source when creating the tar.gz source package.
-# Use -b to build binary only packages as there is no need to waste time on
-# generating the source package.
-fakeroot dpkg-buildpackage -us -uc -I -b
+fakeroot dpkg-buildpackage -us -uc -I $BUILDPACKAGE_FLAGS
+
+# If the step above fails due to missing dependencies, you can manually run
+#   sudo mk-build-deps debian/control -r -i
 
 # Don't log package contents on Travis-CI to save time and log size
 if [[ ! $TRAVIS ]]
diff --git a/debian/control b/debian/control
index fe9a10a2cb8..9ace4dc8841 100644
--- a/debian/control
+++ b/debian/control
@@ -13,17 +13,17 @@ Build-Depends: bison,
                libaio-dev [linux-any],
                libboost-dev,
                libcrack2-dev (>= 2.9.0),
+               libcurl3-dev,
                libjemalloc-dev (>= 3.0.0~) [linux-any],
                libjudy-dev,
                libkrb5-dev,
-               libcurl3-dev,
                libncurses5-dev (>= 5.0-6~),
                libnuma-dev,
                libpam0g-dev,
                libpcre3-dev (>= 2:8.35-3.2~),
                libreadline-gplv2-dev,
-               libssl-dev | libssl1.0-dev,
                libsnappy-dev,
+               libssl-dev | libssl1.0-dev,
                libsystemd-dev,
                libxml2-dev,
                lsb-release,
@@ -38,86 +38,157 @@ Homepage: http://mariadb.org/
 Vcs-Git: https://github.com/MariaDB/server.git
 Vcs-Browser: https://github.com/MariaDB/server/
 
+Package: libmariadb-dev
+Architecture: any
+Section: libdevel
+Depends: libmariadb3 (= ${binary:Version}),
+         zlib1g-dev,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: libmariadbclient-dev
+Replaces: libmariadbclient-dev
+Conflicts: libmariadbclient16-dev
+Provides: libmariadbclient-dev
+Description: MariaDB database development 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
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes development libraries and header files. To allow sources
+ expecting the MariaDB Connector/C to build. Sources that expect the MySQL
+ Client libraries should use files from the libmariadb-dev-compat package.
+
+Package: libmariadb-dev-compat
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Priority: extra
+Depends: libmariadb-dev (= ${binary:Version}),
+         ${misc:Depends}
+Conflicts: libmariadb-client-lgpl-dev-compat,
+           libmariadbclient-dev-compat,
+           libmysqlclient-dev,
+           libmysqlclient10-dev,
+           libmysqlclient12-dev,
+           libmysqlclient14-dev,
+           libmysqlclient15-dev,
+           libmysqlclient16-dev
+Provides: libmariadb-client-lgpl-dev-compat,
+          libmariadbclient-dev-compat,
+          libmysqlclient-dev
+Replaces: libmariadb-client-lgpl-dev-compat,
+          libmariadbclient-dev-compat,
+          libmysqlclient-dev
+Description: MariaDB Connector/C, compatibility symlinks
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes compatibility symlinks to allow sources expecting the
+ MySQL client libraries to be built against MariaDB Connector/C.
+
 Package: libmariadb3
 Architecture: any
 Section: libs
-Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
+Depends: mariadb-common,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libmariadbclient18 (<< 10.2.0),
+           mariadb-galera-server-10.0 (<< 10.0.5),
            mariadb-galera-server-5.5 (<< 5.5.33),
            mariadb-server-10.0 (<< 10.0.5),
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
-           mariadb-server-5.5 (<< 5.5.33),
-           libmariadbclient18 (<< 10.2.0)
+           mariadb-server-5.5 (<< 5.5.33)
+Description: MariaDB database client 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
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes the client library.
+
+Package: libmariadb3-compat
+Architecture: any
+Section: libs
+Depends: libmariadb3,
+         mariadb-common,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: libmysqlclient19,
+        libmysqlclient20
 Replaces: libmysqlclient19,
           libmysqlclient20
 Provides: libmysqlclient19,
           libmysqlclient20
-Description: MariaDB database client library
+Description: MariaDB database client library MySQL compat package
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes the client library.
+ This package includes the client runtime libraries that simulate and replace
+ the equivalents found in MySQL 5.6 and 5.7 (mysqlclient19 and 20).
 
 Package: libmariadbclient18
 Section: libs
 Architecture: any
-Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends}
+Depends: libmariadb3 (= ${binary:Version}),
+         ${misc:Depends}
 Replaces: libmariadbclient18
 Provides: libmariadbclient18
-Description: Virtual package to satisfy external depends
+Description: Virtual package to satisfy external libmariadbclient18 depends
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package provides compatibility symlinks for libmariadb3
+ This package provides compatibility symlinks for binaries that expect to find
+ libmariadbclient.so.18 will automatically use libmariadb.so.3 instead.
 
 Package: libmysqlclient18
 Section: libs
 Architecture: any
-Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends}
+Depends: libmariadb3 (= ${binary:Version}),
+         ${misc:Depends}
 Replaces: libmysqlclient18
 Provides: libmysqlclient18
-Description: Virtual package to satisfy external depends
+Description: Virtual package to satisfy external libmysqlclient18 depends
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package provides compatibility symlinks for libmariadb3
+ This package provides compatibility symlinks for binaries that expect to find
+ libmysqlclient.so.18 will automatically use libmariadb.so.3 instead.
 
-Package: libmariadb-dev
+Package: libmariadbd-dev
 Architecture: any
 Section: libdevel
-Depends: libmariadb3 (= ${binary:Version}),
-         zlib1g-dev,
+Provides: libmysqld-dev
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libmariadb-dev (= ${binary:Version}),
+         libmariadbd19 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libmariadbclient-dev, libmysqlclient-dev
-Replaces: libmariadbclient-dev, libmysqlclient-dev
-Conflicts: libmariadbclient16-dev,
-           libmysqlclient10-dev,
-           libmysqlclient12-dev,
-           libmysqlclient14-dev,
-           libmysqlclient15-dev,
-           libmysqlclient16-dev
-Provides: libmariadbclient-dev, libmariadbclient-dev-compat, libmysqlclient-dev
-Description: MariaDB database development files
+Breaks: libmysqld-dev
+Replaces: libmysqld-dev
+Description: MariaDB embedded database, development 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
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes development libraries and header files.
+ This package includes the embedded server library development and header files.
 
 Package: libmariadbd19
 Architecture: any
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Multi-Arch: same
 Breaks: libmariadbd-dev (<< ${source:Version})
 Replaces: libmariadbd-dev (<< ${source:Version})
@@ -129,28 +200,10 @@ Description: MariaDB embedded database, shared library
  .
  This package includes a shared library for embedded MariaDB applications
 
-Package: libmariadbd-dev
-Architecture: any
-Section: libdevel
-Provides: libmysqld-dev
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libmariadb-dev (= ${binary:Version}),
-        libmariadbd19 (= ${binary:Version}),
-        ${misc:Depends},
-        ${shlibs:Depends}
-Breaks: libmysqld-dev
-Replaces: libmysqld-dev
-Description: MariaDB embedded database, development 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
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the embedded server library development and header files.
-
 Package: mysql-common
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -162,7 +215,9 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
 
 Package: mariadb-common
 Architecture: all
-Depends: mysql-common, ${misc:Depends}, ${shlibs:Depends}
+Depends: mysql-common,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -284,7 +339,9 @@ Provides: default-mysql-client,
           mysql-client-5.6,
           mysql-client-5.7,
           virtual-mysql-client
-Recommends: libdbd-mysql-perl (>= 1.2202), libdbi-perl, libterm-readkey-perl
+Recommends: libdbd-mysql-perl (>= 1.2202),
+            libdbi-perl,
+            libterm-readkey-perl
 Description: MariaDB database client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -353,9 +410,14 @@ Description: MariaDB database core server files
 
 Package: mariadb-server-10.3
 Architecture: any
-Suggests: mailx, mariadb-test, netcat-openbsd, tinyca
+Suggests: mailx,
+          mariadb-test,
+          netcat-openbsd,
+          tinyca
 Recommends: libhtml-template-perl
-Pre-Depends: adduser (>= 3.40), debconf, mariadb-common (>= ${source:Version})
+Pre-Depends: adduser (>= 3.40),
+             debconf,
+             mariadb-common (>= ${source:Version})
 Depends: bsdutils,
          coreutils,
          findutils,
@@ -416,7 +478,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mysql-server-5.6,
           mysql-server-5.7,
           virtual-mysql-server
-Provides: default-mysql-server, virtual-mysql-server
+Provides: default-mysql-server,
+          virtual-mysql-server
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -427,7 +490,8 @@ Description: MariaDB database server binaries
 
 Package: mariadb-server
 Architecture: all
-Depends: mariadb-server-10.3 (>= ${source:Version}), ${misc:Depends}
+Depends: mariadb-server-10.3 (>= ${source:Version}),
+         ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-server (currently mariadb-server-10.3), as determined by the MariaDB
@@ -442,7 +506,8 @@ Description: MariaDB database server (metapackage depending on the latest versio
 
 Package: mariadb-client
 Architecture: all
-Depends: mariadb-client-10.3 (>= ${source:Version}), ${misc:Depends}
+Depends: mariadb-client-10.3 (>= ${source:Version}),
+         ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-client (currently mariadb-client-10.3), as determined by the MariaDB
@@ -500,7 +565,7 @@ Description: OQGraph storage engine for MariaDB
  This package contains the OQGraph plugin for MariaDB.
 
 Package: mariadb-plugin-tokudb
-Architecture: any
+Architecture: amd64
 Depends: mariadb-server-10.3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -519,7 +584,7 @@ Description: TokuDB storage engine for MariaDB
  This package contains the TokuDB plugin for MariaDB.
 
 Package: mariadb-plugin-mroonga
-Architecture: any
+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.3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -589,6 +654,7 @@ Replaces: mariadb-gssapi-server-10.1,
           mariadb-gssapi-server-10.2,
           mariadb-gssapi-server-10.3
 Description: GSSAPI authentication plugin for MariaDB server
+ This package contains the server components.
 
 Package: mariadb-plugin-gssapi-client
 Architecture: any
@@ -603,18 +669,19 @@ Replaces: mariadb-gssapi-client-10.1,
           mariadb-gssapi-client-10.2,
           mariadb-gssapi-client-10.3
 Description: GSSAPI authentication plugin for MariaDB client
+ This package contains the client components.
 
 Package: mariadb-backup-10.3
-Section: database
 Architecture: any
 Breaks: mariadb-backup-10.1,
         mariadb-backup-10.2
 Replaces: mariadb-backup-10.1,
-        mariadb-backup-10.2
+          mariadb-backup-10.2
 Depends: mariadb-server-10.3,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Backup tool for MariaDB server
+ This backup tool is guaranteed to be compatible with MariaDB.
 
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
@@ -626,15 +693,14 @@ Description: CrackLib Password Validation Plugin for MariaDB
  This password validation plugin uses cracklib to allow only
  sufficiently secure (as defined by cracklib) user passwords in MariaDB.
 
-Package: mariadb-plugin-aws-key-management-10.3
-Section: database
+Package: mariadb-plugin-aws-key-management
 Architecture: any
 Breaks: mariadb-aws-key-management-10.1,
         mariadb-aws-key-management-10.2
 Replaces: mariadb-aws-key-management-10.1,
           mariadb-aws-key-management-10.2
-Depends: mariadb-server-10.3,
-         libcurl3,
+Depends: libcurl3,
+         mariadb-server-10.3,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Amazon Web Service Key Management Service Plugin for MariaDB
diff --git a/debian/libmariadb-dev-compat.install b/debian/libmariadb-dev-compat.install
new file mode 100644
index 00000000000..7fe10c50f69
--- /dev/null
+++ b/debian/libmariadb-dev-compat.install
@@ -0,0 +1,4 @@
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlclient_r.a
+usr/lib/*/libmysqlclient_r.so
diff --git a/debian/libmariadb-dev-compat.links b/debian/libmariadb-dev-compat.links
new file mode 100644
index 00000000000..11e0dbce225
--- /dev/null
+++ b/debian/libmariadb-dev-compat.links
@@ -0,0 +1,3 @@
+usr/bin/mariadb_config usr/bin/mysql_config
+usr/include/mariadb usr/include/mysql
+usr/share/pkgconfig/mariadb.pc usr/share/pkgconfig/mysqlclient.pc
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index e62aad1b43f..72798dec379 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -1,9 +1,9 @@
-usr/bin/mysql_config
-usr/include/mysql
+usr/bin/mariadb_config
+usr/include/mariadb
 usr/lib/*/libmariadb.so
-usr/lib/*/libmysqlclient.so
-usr/lib/*/libmariadbclient.so
 usr/lib/*/libmariadbclient.a
+usr/lib/*/libmariadbclient.so
 usr/lib/*/libmysqlservices.a
 usr/share/aclocal/mysql.m4
+usr/share/man/man1/mysql_config.1
 usr/share/pkgconfig/mariadb.pc
diff --git a/debian/libmariadb-dev.links b/debian/libmariadb-dev.links
new file mode 100644
index 00000000000..6a7bf707ca7
--- /dev/null
+++ b/debian/libmariadb-dev.links
@@ -0,0 +1 @@
+usr/share/man/man1/mysql_config.1.gz usr/share/man/man1/mariadb_config.1.gz
diff --git a/debian/libmariadb-dev.manpages b/debian/libmariadb-dev.manpages
deleted file mode 100644
index 3aac7f4b4a9..00000000000
--- a/debian/libmariadb-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql_config.1
diff --git a/debian/libmariadb3-compat.install b/debian/libmariadb3-compat.install
new file mode 100644
index 00000000000..4e0d631d6c8
--- /dev/null
+++ b/debian/libmariadb3-compat.install
@@ -0,0 +1,2 @@
+usr/lib/*/libmysqlclient.so.19
+usr/lib/*/libmysqlclient.so.20
diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install
index 58e2bd1dcb2..8636166a493 100644
--- a/debian/libmariadb3.install
+++ b/debian/libmariadb3.install
@@ -1,5 +1,5 @@
-usr/lib/*/libmysqlclient.so.19
-usr/lib/*/libmysqlclient.so.20
 usr/lib/*/libmariadb.so.*
+usr/lib/mysql/plugin/client_ed25519.so
 usr/lib/mysql/plugin/dialog.so
 usr/lib/mysql/plugin/mysql_clear_password.so
+usr/lib/mysql/plugin/sha256_password.so
diff --git a/debian/libmariadbd-dev.install b/debian/libmariadbd-dev.install
index 6fe225b15ba..4608bf6e838 100644
--- a/debian/libmariadbd-dev.install
+++ b/debian/libmariadbd-dev.install
@@ -1,3 +1,2 @@
-usr/bin/mariadb_config
 usr/lib/*/libmysqld.a
 usr/lib/*/libmysqld.so
diff --git a/debian/mariadb-backup-10.3.files b/debian/mariadb-backup-10.3.install
index 734117c92e2..734117c92e2 100644
--- a/debian/mariadb-backup-10.3.files
+++ b/debian/mariadb-backup-10.3.install
diff --git a/debian/mariadb-client-10.3.README.Debian b/debian/mariadb-client-10.3.README.Debian
index b245638f9c9..64f0f509951 100644
--- a/debian/mariadb-client-10.3.README.Debian
+++ b/debian/mariadb-client-10.3.README.Debian
@@ -1,4 +1,4 @@
 FAQ:
 
-Q: My <tab> completition is gone, why?
+Q: My <tab> completion is gone, why?
 A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!
diff --git a/debian/mariadb-client-10.3.docs b/debian/mariadb-client-10.3.docs
index 8117d689011..c09092629c3 100644
--- a/debian/mariadb-client-10.3.docs
+++ b/debian/mariadb-client-10.3.docs
@@ -1,2 +1,2 @@
-debian/additions/innotop/changelog.innotop
 README.md
+debian/additions/innotop/changelog.innotop
diff --git a/debian/mariadb-client-10.3.install b/debian/mariadb-client-10.3.install
index 271f2a2f417..945bf77c689 100644
--- a/debian/mariadb-client-10.3.install
+++ b/debian/mariadb-client-10.3.install
@@ -10,3 +10,13 @@ usr/bin/mysqldumpslow
 usr/bin/mysqlimport
 usr/bin/mysqlshow
 usr/bin/mysqlslap
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysql_waitpid.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
diff --git a/debian/mariadb-client-10.3.links b/debian/mariadb-client-10.3.links
index 0b86e87f2e9..4a504969246 100644
--- a/debian/mariadb-client-10.3.links
+++ b/debian/mariadb-client-10.3.links
@@ -1,6 +1,6 @@
-usr/bin/mysqlcheck usr/bin/mysqlrepair
 usr/bin/mysqlcheck usr/bin/mysqlanalyze
 usr/bin/mysqlcheck usr/bin/mysqloptimize
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
+usr/bin/mysqlcheck usr/bin/mysqlrepair
 usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz
 usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
diff --git a/debian/mariadb-client-10.3.manpages b/debian/mariadb-client-10.3.manpages
index 504619785bc..6f3e2bc188c 100644
--- a/debian/mariadb-client-10.3.manpages
+++ b/debian/mariadb-client-10.3.manpages
@@ -1,12 +1,2 @@
 debian/additions/innotop/innotop.1
-debian/tmp/usr/share/man/man1/mysqlaccess.1
-debian/tmp/usr/share/man/man1/mysqladmin.1
-debian/tmp/usr/share/man/man1/mysqldump.1
-debian/tmp/usr/share/man/man1/mysqldumpslow.1
-debian/tmp/usr/share/man/man1/mysql_find_rows.1
-debian/tmp/usr/share/man/man1/mysql_fix_extensions.1
-debian/tmp/usr/share/man/man1/mysqlimport.1
 debian/additions/mysqlreport.1
-debian/tmp/usr/share/man/man1/mysqlshow.1
-debian/tmp/usr/share/man/man1/mysqlslap.1
-debian/tmp/usr/share/man/man1/mysql_waitpid.1
diff --git a/debian/mariadb-client-core-10.3.install b/debian/mariadb-client-core-10.3.install
index 6308d769930..a2781309439 100644
--- a/debian/mariadb-client-core-10.3.install
+++ b/debian/mariadb-client-core-10.3.install
@@ -1,2 +1,4 @@
 usr/bin/mysql
 usr/bin/mysqlcheck
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-client-core-10.3.manpages b/debian/mariadb-client-core-10.3.manpages
deleted file mode 100644
index 2be91d81f9a..00000000000
--- a/debian/mariadb-client-core-10.3.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql.1
-debian/tmp/usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-common.install b/debian/mariadb-common.install
index 78dbc22b9f6..611c7d4d36e 100644
--- a/debian/mariadb-common.install
+++ b/debian/mariadb-common.install
@@ -1 +1 @@
-debian/additions/mariadb.cnf etc/mysql/conf.d
+debian/additions/mariadb.cnf etc/mysql/
diff --git a/debian/mariadb-plugin-aws-key-management-10.2.install b/debian/mariadb-plugin-aws-key-management-10.2.install
deleted file mode 100644
index ed966b4115d..00000000000
--- a/debian/mariadb-plugin-aws-key-management-10.2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/mysql/plugin/aws_key_management.so
-debian/additions/enable_encryption.preset etc/mysql/conf.d/
diff --git a/debian/mariadb-plugin-aws-key-management.install b/debian/mariadb-plugin-aws-key-management.install
new file mode 100644
index 00000000000..199d4c87950
--- /dev/null
+++ b/debian/mariadb-plugin-aws-key-management.install
@@ -0,0 +1,3 @@
+debian/additions/enable_encryption.preset etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/aws_key_management.cnf etc/mysql/mariadb.conf.d
+usr/lib/mysql/plugin/aws_key_management.so
diff --git a/debian/mariadb-plugin-connect.install b/debian/mariadb-plugin-connect.install
index 8a7aee412df..22d73c7df05 100644
--- a/debian/mariadb-plugin-connect.install
+++ b/debian/mariadb-plugin-connect.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/connect.cnf
+etc/mysql/conf.d/connect.cnf  etc/mysql/mariadb.conf.d
 usr/lib/mysql/plugin/ha_connect.so
diff --git a/debian/mariadb-plugin-mroonga.install b/debian/mariadb-plugin-mroonga.install
index c28fde2fd18..fedcf62eef0 100644
--- a/debian/mariadb-plugin-mroonga.install
+++ b/debian/mariadb-plugin-mroonga.install
@@ -1,3 +1,5 @@
 usr/lib/mysql/plugin/ha_mroonga.so
+usr/share/mysql/mroonga/AUTHORS
+usr/share/mysql/mroonga/COPYING
 usr/share/mysql/mroonga/install.sql
 usr/share/mysql/mroonga/uninstall.sql
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
index ee45a822e0c..224ef5501c5 100644
--- a/debian/mariadb-plugin-rocksdb.install
+++ b/debian/mariadb-plugin-rocksdb.install
@@ -1,4 +1,4 @@
 etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
-usr/lib/mysql/plugin/ha_rocksdb.so
 usr/bin/mysql_ldb
 usr/bin/sst_dump
+usr/lib/mysql/plugin/ha_rocksdb.so
diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install
index 3c366ee0c44..d15db03b3e5 100644
--- a/debian/mariadb-plugin-tokudb.install
+++ b/debian/mariadb-plugin-tokudb.install
@@ -1,4 +1,7 @@
 etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
+usr/bin/tokuft_logprint
 usr/bin/tokuftdump
 usr/lib/mysql/plugin/ha_tokudb.so
 usr/share/doc/mariadb-server-10.3/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
+usr/share/man/man1/tokuft_logdump.1
+usr/share/man/man1/tokuftdump.1
diff --git a/debian/mariadb-server-10.3.README.Debian b/debian/mariadb-server-10.3.README.Debian
index be2e33d705d..ca81cc357c4 100644
--- a/debian/mariadb-server-10.3.README.Debian
+++ b/debian/mariadb-server-10.3.README.Debian
@@ -42,7 +42,7 @@ https://mariadb.com/kb
 It is strongly recommended you create an admin users for your database
 adminstration needs.
 
-If your your local unix account is the one you want to have local super user
+If your local unix account is the one you want to have local super user
 access on your database with you can create the following account that will
 only work for the local unix user connecting to the database locally.
 
@@ -57,14 +57,14 @@ the DB server over the network:
 
   sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'%' IDENTIFIED BY 'password' WITH GRANT OPTION"
 
-Scripts should run as a user have have the required grants and be identified via unix_socket.
+Scripts should run as a user have the required grants and be identified via unix_socket.
 
 If you are too tired to type the password in every time and unix_socket auth
 doesn't suit your needs, you can store it in the file $HOME/.my.cnf. It should
-be chmod 0600 (-rw------- username username .my.cnf) to ensure that nobody else
+be chmod 0600 (-rw------- username usergroup .my.cnf) to ensure that nobody else
 can read it.  Every other configuration parameter can be stored there, too.
 
-For more information in the MariaDB manual in/usr/share/doc/mariadb-doc or 
+For more information in the MariaDB manual in/usr/share/doc/mariadb-doc or
 https://mariadb.com/kb/en/configuring-mariadb-with-mycnf/.
 
 ATTENTION: It is necessary, that a ~/.my.cnf from root always contains a "user"
diff --git a/debian/mariadb-server-10.3.install b/debian/mariadb-server-10.3.install
index 604179c7dca..d8de5512b05 100644
--- a/debian/mariadb-server-10.3.install
+++ b/debian/mariadb-server-10.3.install
@@ -19,7 +19,6 @@ usr/bin/myisamchk
 usr/bin/myisamlog
 usr/bin/myisampack
 usr/bin/mysql_convert_table_format
-usr/bin/mysql_install_db
 usr/bin/mysql_plugin
 usr/bin/mysql_secure_installation
 usr/bin/mysql_setpermission
@@ -34,11 +33,12 @@ usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
 usr/bin/wsrep_sst_common
+usr/bin/wsrep_sst_mariabackup
 usr/bin/wsrep_sst_mysqldump
 usr/bin/wsrep_sst_rsync
 usr/bin/wsrep_sst_xtrabackup
 usr/bin/wsrep_sst_xtrabackup-v2
-usr/bin/wsrep_sst_mariabackup
+usr/lib/mysql/plugin/auth_ed25519.so
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
 usr/lib/mysql/plugin/file_key_management.so
@@ -58,6 +58,39 @@ usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/mysql/plugin/wsrep_info.so
 usr/share/apport/package-hooks/source_mariadb-10.3.py
 usr/share/doc/mariadb-server-10.3/mysqld.sym.gz
+usr/share/man/man1/aria_chk.1
+usr/share/man/man1/aria_dump_log.1
+usr/share/man/man1/aria_ftdump.1
+usr/share/man/man1/aria_pack.1
+usr/share/man/man1/aria_read_log.1
+usr/share/man/man1/galera_new_cluster.1
+usr/share/man/man1/galera_recovery.1
+usr/share/man/man1/mariadb-service-convert.1
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysql_plugin.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqld_safe_helper.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/wsrep_sst_common.1
+usr/share/man/man1/wsrep_sst_mysqldump.1
+usr/share/man/man1/wsrep_sst_rsync.1
+usr/share/man/man1/wsrep_sst_xtrabackup-v2.1
+usr/share/man/man1/wsrep_sst_xtrabackup.1
 usr/share/mysql/errmsg-utf8.txt
 usr/share/mysql/fill_help_tables.sql
 usr/share/mysql/maria_add_gis_sp_bootstrap.sql
diff --git a/debian/mariadb-server-10.3.manpages b/debian/mariadb-server-10.3.manpages
deleted file mode 100644
index 1825b7655da..00000000000
--- a/debian/mariadb-server-10.3.manpages
+++ /dev/null
@@ -1,25 +0,0 @@
-debian/tmp/usr/share/man/man1/aria_chk.1
-debian/tmp/usr/share/man/man1/aria_dump_log.1
-debian/tmp/usr/share/man/man1/aria_ftdump.1
-debian/tmp/usr/share/man/man1/aria_pack.1
-debian/tmp/usr/share/man/man1/aria_read_log.1
-debian/tmp/usr/share/man/man1/msql2mysql.1
-debian/tmp/usr/share/man/man1/myisamchk.1
-debian/tmp/usr/share/man/man1/myisam_ftdump.1
-debian/tmp/usr/share/man/man1/myisamlog.1
-debian/tmp/usr/share/man/man1/myisampack.1
-debian/tmp/usr/share/man/man1/my_print_defaults.1
-debian/tmp/usr/share/man/man1/mysqlbinlog.1
-debian/tmp/usr/share/man/man1/mysql_convert_table_format.1
-debian/tmp/usr/share/man/man1/mysqld_multi.1
-debian/tmp/usr/share/man/man1/mysqld_safe.1
-debian/tmp/usr/share/man/man1/mysqlhotcopy.1
-debian/tmp/usr/share/man/man1/mysql_install_db.1
-debian/tmp/usr/share/man/man1/mysql_plugin.1
-debian/tmp/usr/share/man/man1/mysql_secure_installation.1
-debian/tmp/usr/share/man/man1/mysql_setpermission.1
-debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
-debian/tmp/usr/share/man/man1/perror.1
-debian/tmp/usr/share/man/man1/replace.1
-debian/tmp/usr/share/man/man1/resolveip.1
-debian/tmp/usr/share/man/man1/resolve_stack_dump.1
diff --git a/debian/mariadb-server-10.3.mysql.init b/debian/mariadb-server-10.3.mysql.init
index d7f6d58e8ca..35a52d5d8db 100644
--- a/debian/mariadb-server-10.3.mysql.init
+++ b/debian/mariadb-server-10.3.mysql.init
@@ -25,7 +25,7 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
 
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 
-# priority can be overriden and "-s" adds output to stderr
+# priority can be overridden and "-s" adds output to stderr
 ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
 
 if [ -f /etc/default/mysql ]; then
diff --git a/debian/mariadb-server-core-10.3.install b/debian/mariadb-server-core-10.3.install
index d882bd53f52..46c116b618d 100644
--- a/debian/mariadb-server-core-10.3.install
+++ b/debian/mariadb-server-core-10.3.install
@@ -1,6 +1,11 @@
 usr/bin/innochecksum
+usr/bin/mysql_install_db
 usr/bin/mysql_upgrade
 usr/sbin/mysqld
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man8/mysqld.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
 usr/share/mysql/danish
diff --git a/debian/mariadb-server-core-10.3.manpages b/debian/mariadb-server-core-10.3.manpages
deleted file mode 100644
index 234108cde50..00000000000
--- a/debian/mariadb-server-core-10.3.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/man/man8/mysqld.8
-debian/tmp/usr/share/man/man1/innochecksum.1
-debian/tmp/usr/share/man/man1/mysql_upgrade.1
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index 75f52b3f526..e1de4074310 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -17,9 +17,16 @@ usr/lib/mysql/plugin/qa_auth_client.so
 usr/lib/mysql/plugin/qa_auth_interface.so
 usr/lib/mysql/plugin/qa_auth_server.so
 usr/lib/mysql/plugin/test_versioning.so
+usr/share/man/man1/mysql-stress-test.pl.1
+usr/share/man/man1/mysql-test-run.pl.1
+usr/share/man/man1/mysql_client_test.1
+usr/share/man/man1/mysql_client_test_embedded.1
+usr/share/man/man1/mysqltest.1
+usr/share/man/man1/mysqltest_embedded.1
 usr/share/mysql/mysql-test/README
 usr/share/mysql/mysql-test/README-gcov
 usr/share/mysql/mysql-test/README.stress
+usr/share/mysql/mysql-test/dgcov.pl
 usr/share/mysql/mysql-test/disabled.def
 usr/share/mysql/mysql-test/lib
 usr/share/mysql/mysql-test/mysql-stress-test.pl
diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links
index 082680fe5ed..884b25a81da 100644
--- a/debian/mariadb-test.links
+++ b/debian/mariadb-test.links
@@ -1,2 +1,2 @@
-usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
 usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
+usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
diff --git a/debian/mariadb-test.manpages b/debian/mariadb-test.manpages
deleted file mode 100644
index 33ce8710ea7..00000000000
--- a/debian/mariadb-test.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql_client_test.1
-debian/tmp/usr/share/man/man1/mysql_client_test_embedded.1
-debian/tmp/usr/share/man/man1/mysqltest.1
-debian/tmp/usr/share/man/man1/mysqltest_embedded.1
diff --git a/debian/mysql-common.install b/debian/mysql-common.install
index 5ff685f42ff..264df611822 100644
--- a/debian/mysql-common.install
+++ b/debian/mysql-common.install
@@ -1,2 +1,2 @@
 debian/additions/my.cnf etc/mysql
-usr/share/mysql-common/internal-use-only
\ No newline at end of file
+usr/share/mysql-common/internal-use-only
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 00000000000..c151cf753e6
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,127 @@
+lib/systemd/system/mariadb.service # Installed by rules file
+lib/systemd/system/mariadb@.service # Installed by rules file
+usr/bin/mysql_config # We already have the MariaDB variant
+usr/bin/mysql_embedded # Huge 500 MB file. Not intended for distribution via any disto package.
+usr/bin/mytop # Mytop is distributed from a separate source package
+usr/lib/sysusers.d/sysusers.conf
+usr/lib/tmpfiles.d/tmpfiles.conf
+usr/lib/mysql/plugin/JavaWrappers.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
+usr/lib/mysql/plugin/JdbcInterface.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
+usr/share/doc/mariadb-server-10.3/COPYING
+usr/share/doc/mariadb-server-10.3/COPYING.AGPLv3
+usr/share/doc/mariadb-server-10.3/COPYING.GPLv2
+usr/share/doc/mariadb-server-10.3/COPYING.thirdparty
+usr/share/doc/mariadb-server-10.3/CREDITS
+usr/share/doc/mariadb-server-10.3/EXCEPTIONS-CLIENT
+usr/share/doc/mariadb-server-10.3/INSTALL-BINARY
+usr/share/doc/mariadb-server-10.3/PATENTS
+usr/share/doc/mariadb-server-10.3/README-wsrep
+usr/share/groonga/COPYING
+usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
+usr/share/groonga-normalizer-mysql/README.md
+usr/share/groonga/README.md
+usr/share/man/man1/my_safe_process.1
+usr/share/man/man1/mysql.server.1
+usr/share/mysql/binary-configure
+usr/share/mysql/magic
+usr/share/mysql/maria_add_gis_sp.sql
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/mysql-log-rotate
+usr/share/mysql/mysql.server
+usr/share/mysql/mysql-test/mtr # Already created by mariadb-test.links
+usr/share/mysql/mysql-test/mysql-test-run # Already created by mariadb-test.links
+usr/share/mysql/mysql_to_mariadb.sql
+usr/share/mysql/policy/apparmor/README # In MariaDB we don't want to use AppArmor at the moment
+usr/share/mysql/policy/apparmor/usr.sbin.mysqld # In MariaDB we don't want to use AppArmor at the moment
+usr/share/mysql/policy/apparmor/usr.sbin.mysqld.local # In MariaDB we don't want to use AppArmor at the moment
+usr/share/mysql/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment
+usr/share/mysql/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment
+usr/share/mysql/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment
+usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment
+usr/share/mysql/systemd/mariadb.service # Installed by rules file
+usr/share/mysql/systemd/mariadb@.service # Installed by rules file
+usr/share/mysql/systemd/use_galera_new_cluster.conf
+usr/share/mysql/wsrep.cnf
+usr/sql-bench/bench-count-distinct
+usr/sql-bench/bench-init.pl # SQL-bench is distributed from a separate source package
+usr/sql-bench/compare-results
+usr/sql-bench/copy-db
+usr/sql-bench/crash-me
+usr/sql-bench/Data/ATIS/aircraft.txt
+usr/sql-bench/Data/ATIS/airline.txt
+usr/sql-bench/Data/ATIS/airport_service.txt
+usr/sql-bench/Data/ATIS/airport.txt
+usr/sql-bench/Data/ATIS/city.txt
+usr/sql-bench/Data/ATIS/class_of_service.txt
+usr/sql-bench/Data/ATIS/code_description.txt
+usr/sql-bench/Data/ATIS/compound_class.txt
+usr/sql-bench/Data/ATIS/connect_leg.txt
+usr/sql-bench/Data/ATIS/date_day.txt
+usr/sql-bench/Data/ATIS/day_name.txt
+usr/sql-bench/Data/ATIS/dual_carrier.txt
+usr/sql-bench/Data/ATIS/fare.txt
+usr/sql-bench/Data/ATIS/fconnection.txt
+usr/sql-bench/Data/ATIS/flight_class.txt
+usr/sql-bench/Data/ATIS/flight_day.txt
+usr/sql-bench/Data/ATIS/flight_fare.txt
+usr/sql-bench/Data/ATIS/flight.txt
+usr/sql-bench/Data/ATIS/food_service.txt
+usr/sql-bench/Data/ATIS/ground_service.txt
+usr/sql-bench/Data/ATIS/month_name.txt
+usr/sql-bench/Data/ATIS/restrict_carrier.txt
+usr/sql-bench/Data/ATIS/restrict_class.txt
+usr/sql-bench/Data/ATIS/restriction.txt
+usr/sql-bench/Data/ATIS/state.txt
+usr/sql-bench/Data/ATIS/stop1.txt
+usr/sql-bench/Data/ATIS/stop.txt
+usr/sql-bench/Data/ATIS/time_interval.txt
+usr/sql-bench/Data/ATIS/time_zone.txt
+usr/sql-bench/Data/ATIS/transport.txt
+usr/sql-bench/Data/Wisconsin/onek.data
+usr/sql-bench/Data/Wisconsin/tenk.data
+usr/sql-bench/graph-compare-results
+usr/sql-bench/innotest1
+usr/sql-bench/innotest1a
+usr/sql-bench/innotest1b
+usr/sql-bench/innotest2
+usr/sql-bench/innotest2a
+usr/sql-bench/innotest2b
+usr/sql-bench/limits/access.cfg
+usr/sql-bench/limits/access_odbc.cfg
+usr/sql-bench/limits/Adabas.cfg
+usr/sql-bench/limits/db2.cfg
+usr/sql-bench/limits/empress.cfg
+usr/sql-bench/limits/frontbase.cfg
+usr/sql-bench/limits/Informix.cfg
+usr/sql-bench/limits/interbase.cfg
+usr/sql-bench/limits/interbase-dialect1.cfg
+usr/sql-bench/limits/interbase-dialect3.cfg
+usr/sql-bench/limits/interbase-superserver.cfg
+usr/sql-bench/limits/mimer.cfg
+usr/sql-bench/limits/msql.cfg
+usr/sql-bench/limits/ms-sql65.cfg
+usr/sql-bench/limits/ms-sql.cfg
+usr/sql-bench/limits/mysql-3.22.cfg
+usr/sql-bench/limits/mysql-3.23.cfg
+usr/sql-bench/limits/mysql-4.0.cfg
+usr/sql-bench/limits/mysql-4.1.cfg
+usr/sql-bench/limits/mysql.cfg
+usr/sql-bench/limits/oracle.cfg
+usr/sql-bench/limits/pg.cfg
+usr/sql-bench/limits/solid.cfg
+usr/sql-bench/limits/solid-nt4.cfg
+usr/sql-bench/limits/sybase.cfg
+usr/sql-bench/myisam.cnf
+usr/sql-bench/README
+usr/sql-bench/run-all-tests
+usr/sql-bench/server-cfg
+usr/sql-bench/test-alter-table
+usr/sql-bench/test-ATIS
+usr/sql-bench/test-big-tables
+usr/sql-bench/test-connect
+usr/sql-bench/test-create
+usr/sql-bench/test-insert
+usr/sql-bench/test-select
+usr/sql-bench/test-table-elimination
+usr/sql-bench/test-transactions
+usr/sql-bench/test-wisconsin
diff --git a/debian/rules b/debian/rules
index 76433d47576..b4ef2e5da6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ else
 endif
 
 # Ignore test suite exit code on unstable platforms
-ifneq (,$(filter $(ARCH), mips mipsel))
+ifneq (,$(filter $(ARCH),mips mipsel mips64el alpha powerpc sh4 hurd-i386 sparc64 kfreebsd-i386 kfreebsd-amd64))
     TESTSUITE_FAIL_CMD:=true
 else
     TESTSUITE_FAIL_CMD:=exit 1
@@ -114,11 +114,6 @@ override_dh_auto_install:
 	dh_testdir
 	dh_testroot
 
-# Skip TokuDB if arch is not amd64
-ifneq ($(ARCH), amd64)
-	sed -i -e "/Package: mariadb-plugin-tokudb/,+18d" debian/control
-endif
-
 	# If libthrift-dev was available (manually installed, as it is
 	# not in Debian) and ha_cassandra.so was thus built, create package,
 	# otherwise skip it.
@@ -153,13 +148,13 @@ endif
 	install -D -m 644 debian/mariadb-server-10.3.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.3.py
 
 	# Install libmariadbclient18 compatibility links
-	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so
-	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18
+	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so
+	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18
 
 	# Install libmysqlclientclientXX compatibility links
-	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.18
-	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19
-	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20
+	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.18
+	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19
+	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20
 
 	touch $@
 
@@ -182,7 +177,11 @@ override_dh_installcron-arch:
 get-orig-source:
 	uscan --force-download --verbose
 
+# 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
+# white list file only starting from Debian Stretch and Ubuntu Xenial.
+# To find more, grep build logs for 'but is not installed to anywhere'.
 %:
-	dh $@ --parallel --with dpatch --with systemd
+	dh $@ --parallel --with dpatch --with systemd --list-missing
 
 # vim: ts=8