Merge tag 'mariadb-10.0.20' into 10.1

2 files changed, 85 insertions, 41 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 9e8091f7158..3c481a2ac61 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -4,7 +4,13 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, cmake (>= 2.7), libaio-dev, ${MAYBE_LIBCRACK} libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+               perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+               zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev,
+               libpam0g-dev, psmisc, po-debconf, chrpath,
+               dpatch, gawk, bison, lsb-release, hardening-wrapper,
+               cmake (>= 2.7), libaio-dev, ${MAYBE_LIBCRACK}
+               libjemalloc-dev (>= 3.0.0)
 Standards-Version: 3.8.3
 Homepage: http://mariadb.org/
 Vcs-Browser: https://github.com/MariaDB/server/tree/10.1/
@@ -16,7 +22,9 @@ Architecture: any
 Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5),
            mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33),
-           mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
+           mariadb-server-5.1,
+           mariadb-server-5.2,
+           mariadb-server-5.3
 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
@@ -105,13 +113,15 @@ Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
     mysql-client-core-5.1, mysql-client-core-5.5,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
+    mariadb-client-5.3, mariadb-client-core-5.3,
+    mariadb-client-5.5, mariadb-client-core-5.5
 Replaces: 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,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
+    mariadb-client-5.3, mariadb-client-core-5.3,
+    mariadb-client-5.5, mariadb-client-core-5.5
 Description: MariaDB database core 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
@@ -131,11 +141,16 @@ Provides: virtual-mysql-client, mysql-client,
     mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
 Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
     mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
+    mariadb-client-5.1,
+    mariadb-client-5.2,
+    mariadb-client-5.3,
+    mariadb-client-5.5, mysql-client-5.5
 Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
-    mysql-client-5.5,
     mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3
+    mariadb-client-5.1,
+    mariadb-client-5.2,
+    mariadb-client-5.3,
+    mariadb-client-5.5, mysql-client-5.5
 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
@@ -149,18 +164,16 @@ Package: mariadb-server-core-10.1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
-Conflicts: mariadb-server-5.1 (<< 5.1.60),
-    mariadb-server-5.2 (<< 5.2.10),
-    mariadb-server-5.3 (<< 5.3.3),
-    mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
-Replaces: mariadb-server-5.1 (<< 5.1.60),
-    mariadb-server-5.2 (<< 5.2.10),
-    mariadb-server-5.3 (<< 5.3.3),
-    mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Conflicts: mysql-server-5.0, mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.3,
+    mariadb-server-core-5.5, mysql-server-core-5.5
+Replaces: mysql-server-5.0, mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.3,
+    mariadb-server-core-5.5, mysql-server-core-5.5
 Description: MariaDB database core server 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
@@ -173,10 +186,10 @@ Package: mariadb-test-10.1
 Section: database
 Architecture: any
 Depends: mariadb-server-10.1 (= ${source:Version}), mariadb-client-10.1 (= ${source:Version})
+Suggests: patch
 Conflicts: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
     mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
-Suggests: patch
 Replaces: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
 Description: MariaDB database regression test suite
@@ -199,12 +212,18 @@ Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl,
          coreutils, bsdutils, findutils, tar
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Description: MariaDB database server binaries
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 1c555ecef30..ebb34de1761 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -4,7 +4,13 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, cmake (>= 2.7), libaio-dev, ${MAYBE_LIBCRACK} libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+               perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+               zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev,
+               libpam0g-dev, psmisc, po-debconf, chrpath,
+               dpatch, gawk, bison, lsb-release, hardening-wrapper,
+               cmake (>= 2.7), libaio-dev, ${MAYBE_LIBCRACK}
+               libjemalloc-dev (>= 3.0.0)
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.1/files
@@ -16,7 +22,9 @@ Architecture: any
 Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: mariadb-server-10.0 (<< 10.0.5), mariadb-galera-server-10.0 (<< 10.0.5),
            mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33),
-           mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
+           mariadb-server-5.1,
+           mariadb-server-5.2,
+           mariadb-server-5.3
 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
@@ -105,13 +113,15 @@ Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
     mysql-client-core-5.1, mysql-client-core-5.5,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
+    mariadb-client-5.3, mariadb-client-core-5.3,
+    mariadb-client-5.5, mariadb-client-core-5.5
 Replaces: 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,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,
-    mariadb-client-5.3, mariadb-client-core-5.3
+    mariadb-client-5.3, mariadb-client-core-5.3,
+    mariadb-client-5.5, mariadb-client-core-5.5
 Description: MariaDB database core 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
@@ -131,11 +141,16 @@ Provides: virtual-mysql-client, mysql-client,
     mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
 Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
     mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
+    mariadb-client-5.1,
+    mariadb-client-5.2,
+    mariadb-client-5.3,
+    mariadb-client-5.5, mysql-client-5.5
 Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
-    mysql-client-5.5,
     mariadb-client (<< ${source:Version}),
-    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3
+    mariadb-client-5.1,
+    mariadb-client-5.2,
+    mariadb-client-5.3,
+    mariadb-client-5.5, mysql-client-5.5
 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
@@ -149,12 +164,16 @@ Package: mariadb-server-core-10.1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
-Conflicts: mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
-Replaces: mysql-server-5.0,
-    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
-    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Conflicts: mysql-server-5.0, mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.3,
+    mariadb-server-core-5.5, mysql-server-core-5.5
+Replaces: mysql-server-5.0, mysql-server-core-5.0,
+    mariadb-server-core-5.1, mysql-server-core-5.1,
+    mariadb-server-core-5.2,
+    mariadb-server-core-5.3,
+    mariadb-server-core-5.5, mysql-server-core-5.5
 Description: MariaDB database core server 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
@@ -193,12 +212,18 @@ Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl,
          coreutils, bsdutils, findutils, tar
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
-    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
-    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-4.1, mysql-server-5.0,
+    mariadb-server-5.1, mysql-server-5.1,
+    mariadb-server-5.2,
+    mariadb-server-5.3,
+    mariadb-server-5.5, mysql-server-5.5,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
 Description: MariaDB database server binaries