Merge mariadb-10.5.5

1 files changed, 40 insertions, 121 deletions

diff --git a/debian/control b/debian/control
index b4797c59f29..1f2a8a2878e 100644
--- 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],
@@ -276,36 +277,22 @@ 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 (<< ${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,
           mysql-client-core-5.1,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
@@ -349,50 +336,28 @@ 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 (<< ${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 (<< ${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 (<< ${source:Version}),
-          mariadb-server-10.5 (<< ${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,
@@ -431,40 +396,15 @@ 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 (<< ${source:Version}),
-        mariadb-server-10.3,
-        mariadb-server-10.4,
-        mariadb-server-10.5 (<< ${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 (<< ${source:Version}),
-          mariadb-server-10.3,
-          mariadb-server-10.4,
-          mariadb-server-10.5 (<< ${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,
           mysql-server-core-5.0,
           mysql-server-core-5.1,
           mysql-server-core-5.5,
@@ -518,11 +458,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,
@@ -531,24 +471,15 @@ 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 (<< ${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}),
           mysql-server-4.1,
           mysql-server-5.0,
           mysql-server-5.1,
@@ -800,32 +731,18 @@ Depends: mariadb-client-10.5 (= ${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
@@ -843,21 +760,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,