Merge tag 'mariadb-10.0.23' into 10.0-galera

6 files changed, 197 insertions, 250 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 3ee877af482..bb14057b43b 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -39,11 +39,15 @@ case "${CODENAME}" in
   *)  LIBREADLINE_DEV=libreadline-gplv2-dev ;;
 esac
 
+sed -i -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" debian/control
+
 case "${CODENAME}" in
   etch|lenny|hardy|intrepid|jaunty|karmic) CMAKE_DEP='' ;;
   *) CMAKE_DEP='cmake (>= 2.7), ' ;;
 esac
 
+sed -i -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g" debian/control
+
 # Clean up build file symlinks that are distro-specific. First remove all, then set
 # new links.
 DISTRODIRS="$(ls ./debian/dist)"
@@ -60,9 +64,7 @@ echo "Copying distribution specific build files for ${DISTRO}"
 DISTROFILES="$(ls ./debian/dist/${DISTRO})"
 for distrofile in ${DISTROFILES}; do
   rm -f "./debian/${distrofile}"
-  sed -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" \
-      -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g"             \
-    < "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}"
+  cat "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}"
   chmod --reference="./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}"
 done;
 
@@ -75,8 +77,9 @@ dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTR
 echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... "
 
 # Build the package.
-#
-fakeroot dpkg-buildpackage -us -uc
+# Pass -I so that .git and other unnecessary temporary and source control files
+# will be ignored by dpkg-source when createing the tar.gz source package
+fakeroot dpkg-buildpackage -us -uc -I
 
 [ -e debian/autorm-file ] && rm -vf `cat debian/autorm-file`
 
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000000..4b252f95eb0
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,180 @@
+Source: mariadb-10.0
+Section: misc
+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: bison,
+               chrpath,
+               debhelper,
+               dpatch,
+               gawk,
+               hardening-wrapper,
+               libjemalloc-dev (>= 3.0.0),
+               libncurses5-dev (>= 5.0-6),
+               libpam0g-dev,
+               libssl-dev,
+               libwrap0-dev (>= 7.6-8.3),
+               lsb-release,
+               perl (>= 5.6.0),
+               po-debconf,
+               procps | hurd,
+               psmisc,
+               zlib1g-dev (>= 1:1.1.3-5),
+               ${CMAKE_DEP}libaio-dev,
+               ${LIBREADLINE_DEV}
+Standards-Version: 3.8.3
+Homepage: http://mariadb.org/
+Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
+Vcs-Bzr: bzr://lp:maria
+
+Package: mariadb-galera-test-10.0
+Section: database
+Architecture: any
+Depends: mariadb-galera-server-10.0 (= ${source:Version}),
+         mariadb-client-10.0 (>= ${source:Version})
+Suggests: patch
+Conflicts: mariadb-test,
+           mariadb-galera-test (<< ${source:Version}),
+           mariadb-test-5.1,
+           mariadb-test-5.2,
+           mariadb-test-5.3,
+           mariadb-test-5.5,
+           mariadb-test-10.0,
+           mariadb-server-5.5,
+           mariadb-galera-server-5.5,
+           mariadb-server-10.0
+Replaces: mariadb-test (<< ${source:Version}),
+          mariadb-galera-test (<< ${source:Version}),
+          mariadb-test-5.1,
+          mariadb-test-5.2,
+          mariadb-test-5.3,
+          mariadb-test-5.5
+Description: MariaDB database regression test suite
+ 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 regression test suite.
+
+Package: mariadb-galera-server-10.0
+Architecture: any
+Suggests: mailx, mariadb-galera-test, tinyca, netcat-openbsd, socat
+Recommends: libhtml-template-perl
+Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
+Depends: bsdutils,
+         libdbi-perl,
+         lsb-base (>= 3.0-10),
+         mariadb-client-10.0 (>= ${source:Version}),
+         passwd,
+         perl (>= 5.6),
+         psmisc,
+         ${misc:Depends},
+         ${shlibs:Depends},
+         libmariadbclient18 (>= ${binary:Version}),
+         coreutils,
+         findutils,
+         galera-3 (>=25.3),
+         gawk,
+         grep,
+         iproute,
+         lsof,
+         rsync,
+         tar
+Provides: mariadb-server,
+          mariadb-galera-server,
+          mysql-server,
+          virtual-mysql-server,
+          mysql-server-core,
+          mysql-server-core-5.1,
+          mysql-server-core-5.5,
+          mysql-server-core-10.0
+Conflicts: mariadb-galera-server (<< ${source:Version}),
+           mariadb-server,
+           mariadb-server-5.1,
+           mariadb-server-5.2,
+           mariadb-server-5.3,
+           mariadb-server-5.5,
+           mariadb-tokudb-engine-10.0,
+           mariadb-tokudb-engine-5.5,
+           mysql-server (<< ${source:Version}),
+           mysql-server-4.1,
+           mysql-server-5.0,
+           mysql-server-5.1,
+           mysql-server-5.5,
+           mysql-server-5.6,
+           mariadb-server-core-5.1,
+           mariadb-server-core-5.2,
+           mariadb-server-core-5.5,
+           mariadb-server-core-10.0,
+           mysql-server-core-5.0,
+           mysql-server-core-5.1,
+           mysql-server-core-5.5,
+           mysql-server-core-5.6
+Replaces: libmariadbclient-dev (<< 5.5.0),
+          libmariadbclient16 (<< 5.3.4),
+          mariadb-galera-server (<< ${source:Version}),
+          mariadb-server,
+          mariadb-server-5.1,
+          mariadb-server-5.2,
+          mariadb-server-5.3,
+          mariadb-server-5.5,
+          mariadb-tokudb-engine-10.0,
+          mariadb-tokudb-engine-5.5,
+          mysql-server,
+          mysql-server-4.1,
+          mysql-server-5.0,
+          mysql-server-5.1,
+          mysql-server-5.5,
+          mysql-server-5.6,
+          mariadb-server-core-5.1,
+          mariadb-server-core-5.2,
+          mariadb-server-core-5.5,
+          mariadb-server-core-10.0,
+          mysql-server-core-5.0,
+          mysql-server-core-5.1,
+          mysql-server-core-5.5,
+          mysql-server-core-5.6
+Description: MariaDB database server with Galera cluster 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
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes the server binaries.
+
+Package: mariadb-galera-server
+Section: database
+Architecture: all
+Depends: mariadb-galera-server-10.0 (= ${source:Version}), ${misc:Depends}
+Description: MariaDB database server with Galera cluster (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-galera-server (currently mariadb-galera-server-10.0), as determined by the MariaDB
+ maintainers. Install this package if in doubt about which MariaDB-Galera
+ version you need. That will install the version recommended by the
+ package maintainers.
+ .
+ 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.
+
+Package: mariadb-client
+Section: database
+Architecture: all
+Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB
+ maintainers.  Install this package if in doubt about which MariaDB version
+ you want, as this is the one we consider to be in the best shape.
+
+Package: mariadb-galera-test
+Section: database
+Architecture: all
+Depends: mariadb-galera-test-10.0 (= ${source:Version})
+Description: MariaDB database regression test suite (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-galera-test (currently mariadb-galera-test-10.0), as determined by the MariaDB
+ maintainers.
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index 9c98778b4f8..5207620b411 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@
 == MariaDB ==
 
 The Debian package of MySQL was first debianzed on 1997-04-12 by Christian
-Schwarz <schwarz@debian.org> and ist maintained since 1999-04-20 by 
+Schwarz <schwarz@debian.org> and ist maintained since 1999-04-20 by
 Christian Hammers <ch@debian.org>.
 
 The MariaDB packages were initally made by http://ourdelta.org/, and
@@ -17,22 +17,22 @@ According to the file "COPYING" all parts of this package are licenced
 under the terms of the GNU GPL Version 2 of which a copy is available
 in /usr/share/common-licenses.
 
-To allow free software with other licences than the GPL to link against the 
+To allow free software with other licences than the GPL to link against the
 shared library, special terms for "derived works" are granted in the README file of MySQL 5.5, as follows:
 
 > MySQL FOSS License Exception
 > We want free and open source software applications under certain
 > licenses to be able to use specified GPL-licensed MySQL client
 > libraries despite the fact that not all such FOSS licenses are
-> compatible with version 2 of the GNU General Public License.  
-> Therefore there are special exceptions to the terms and conditions 
-> of the GPLv2 as applied to these client libraries, which are 
-> identified and described in more detail in the FOSS License 
-> Exception at 
+> compatible with version 2 of the GNU General Public License.
+> Therefore there are special exceptions to the terms and conditions
+> of the GPLv2 as applied to these client libraries, which are
+> identified and described in more detail in the FOSS License
+> Exception at
 > <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
 
 The manual had to be removed as it is not free in the sense of the
-Debian Free Software Guidelines (DFSG). 
+Debian Free Software Guidelines (DFSG).
 
 
 == innotop ==
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
deleted file mode 100644
index 39d8bcd7130..00000000000
--- a/debian/dist/Debian/control
+++ /dev/null
@@ -1,118 +0,0 @@
-Source: mariadb-10.0
-Section: misc
-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: 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_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
-Standards-Version: 3.8.3
-Homepage: http://mariadb.org/
-Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
-Vcs-Bzr: bzr://lp:maria
-
-Package: mariadb-galera-test-10.0
-Section: database
-Architecture: any
-Depends: mariadb-galera-server-10.0 (= ${source:Version}), mariadb-client-10.0 (>= ${source:Version})
-Suggests: patch
-Conflicts: mariadb-test, mariadb-galera-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
-    mariadb-test-5.5, mariadb-test-10.0,
-    mariadb-server-5.5, mariadb-galera-server-5.5,
-    mariadb-server-10.0
-Replaces: mariadb-test (<< ${source:Version}), mariadb-galera-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
-    mariadb-test-5.5
-Description: MariaDB database regression test suite
- 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 regression test suite.
-
-Package: mariadb-galera-server-10.0
-Architecture: any
-Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd, socat
-Recommends: libhtml-template-perl
-Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl,
-         perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc,
-         passwd, lsb-base (>= 3.0-10), bsdutils,
-         libmariadbclient18 (>= ${binary:Version}), galera-3 (>=25.3),
-         rsync, lsof, grep, gawk, iproute, coreutils, findutils, tar
-Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5,
-          mysql-server-core-10.0, mariadb-server, mysql-server,
-          virtual-mysql-server, mariadb-galera-server
-Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    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,
-    mysql-server-core-5.0,
-    mariadb-server-core-5.1, mysql-server-core-5.1,
-    mariadb-server-core-5.2,
-    mariadb-server-core-5.5, mysql-server-core-5.5,
-    mariadb-server-core-10.0,
-    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    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),
-    mysql-server-core-5.0,
-    mariadb-server-core-5.1, mysql-server-core-5.1,
-    mariadb-server-core-5.2,
-    mariadb-server-core-5.5, mysql-server-core-5.5,
-    mariadb-server-core-10.0,
-    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Description: MariaDB database server with Galera cluster 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
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the server binaries.
-
-Package: mariadb-galera-server
-Section: database
-Architecture: all
-Depends: mariadb-galera-server-10.0 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database server with Galera cluster (metapackage depending on the latest version)
- This is an empty package that depends on the current "best" version of
- mariadb-galera-server (currently mariadb-galera-server-10.0), as determined by the MariaDB
- maintainers. Install this package if in doubt about which MariaDB-Galera
- version you need. That will install the version recommended by the
- package maintainers.
- .
- 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.
-
-Package: mariadb-client
-Section: database
-Architecture: all
-Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB
- maintainers.  Install this package if in doubt about which MariaDB version
- you want, as this is the one we consider to be in the best shape.
-
-Package: mariadb-galera-test
-Section: database
-Architecture: all
-Depends: mariadb-galera-test-10.0 (= ${source:Version})
-Description: MariaDB database regression test suite (metapackage depending on the latest version)
- This is an empty package that depends on the current "best" version of
- mariadb-galera-test (currently mariadb-galera-test-10.0), as determined by the MariaDB
- maintainers.
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
deleted file mode 100644
index 0c0a966ad85..00000000000
--- a/debian/dist/Ubuntu/control
+++ /dev/null
@@ -1,118 +0,0 @@
-Source: mariadb-10.0
-Section: misc
-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: 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_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
-Standards-Version: 3.8.2
-Homepage: http://mariadb.org/
-Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
-Vcs-Bzr: bzr://lp:maria
-
-Package: mariadb-galera-test-10.0
-Section: database
-Architecture: any
-Depends: mariadb-galera-server-10.0 (= ${source:Version}), mariadb-client-10.0 (>= ${source:Version})
-Suggests: patch
-Conflicts: mariadb-test, mariadb-galera-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
-    mariadb-test-5.5, mariadb-test-10.0,
-    mariadb-server-5.5, mariadb-galera-server-5.5,
-    mariadb-server-10.0
-Replaces: mariadb-test (<< ${source:Version}), mariadb-galera-test (<< ${source:Version}),
-    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
-    mariadb-test-5.5
-Description: MariaDB database regression test suite
- 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 regression test suite.
-
-Package: mariadb-galera-server-10.0
-Architecture: any
-Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd, socat
-Recommends: libhtml-template-perl
-Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl,
-         perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc,
-         passwd, lsb-base (>= 3.0-10), bsdutils,
-         libmariadbclient18 (>= ${binary:Version}), galera-3 (>=25.3),
-         rsync, lsof, grep, gawk, iproute, coreutils, findutils, tar
-Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5,
-          mysql-server-core-10.0, mariadb-server, mysql-server,
-          virtual-mysql-server, mariadb-galera-server
-Conflicts: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    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,
-    mysql-server-core-5.0,
-    mariadb-server-core-5.1, mysql-server-core-5.1,
-    mariadb-server-core-5.2,
-    mariadb-server-core-5.5, mysql-server-core-5.5,
-    mariadb-server-core-10.0,
-    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Replaces: mariadb-server, mysql-server, mariadb-galera-server (<< ${source:Version}),
-    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),
-    mysql-server-core-5.0,
-    mariadb-server-core-5.1, mysql-server-core-5.1,
-    mariadb-server-core-5.2,
-    mariadb-server-core-5.5, mysql-server-core-5.5,
-    mariadb-server-core-10.0,
-    mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Description: MariaDB database server with Galera cluster 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
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the server binaries.
-
-Package: mariadb-galera-server
-Section: database
-Architecture: all
-Depends: mariadb-galera-server-10.0 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database server with Galera cluster (metapackage depending on the latest version)
- This is an empty package that depends on the current "best" version of
- mariadb-galera-server (currently mariadb-galera-server-10.0), as determined by the MariaDB
- maintainers. Install this package if in doubt about which MariaDB-Galera
- version you need. That will install the version recommended by the
- package maintainers.
- .
- 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.
-
-Package: mariadb-client
-Section: database
-Architecture: all
-Depends: mariadb-client-10.0 (= ${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.0), as determined by the MariaDB
- maintainers.  Install this package if in doubt about which MariaDB version
- you want, as this is the one we consider to be in the best shape.
-
-Package: mariadb-galera-test
-Section: database
-Architecture: all
-Depends: mariadb-galera-test-10.0 (= ${source:Version})
-Description: MariaDB database regression test suite (metapackage depending on the latest version)
- This is an empty package that depends on the current "best" version of
- mariadb-galera-test (currently mariadb-galera-test-10.0), as determined by the MariaDB
- maintainers.
diff --git a/debian/mariadb-galera-server-10.0.mysql-server.logrotate b/debian/mariadb-galera-server-10.0.mysql-server.logrotate
index 0f0de516b13..789ad353e43 100644
--- a/debian/mariadb-galera-server-10.0.mysql-server.logrotate
+++ b/debian/mariadb-galera-server-10.0.mysql-server.logrotate
@@ -2,7 +2,7 @@
 #   flush-logs'd only once.
 #   Else the binary logs would automatically increase by n times every day.
 # - The error log is obsolete, messages go to syslog now.
-/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log {
+/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log {
 	daily
 	rotate 7
 	missingok