Package: release.debian.org Followup-For: Bug #861803 User: release.debian.org@packages.debian.org Usertags: unblock Control: retitle -1 unblock: mariadb-10.1/10.1.23-8 Dear release team, a couple more of smaller changes has pilled up and ended up in 10.1.23-8. As before I am attaching full debdiff between 10.1.23-2 and 10.1.23-8, but also annotated individual patches from git: 0001-Remove-two-internal-symbols-ll2str-and-longlong2str-.patch - fix FTBFS on kfreebsd-* 0003-Properly-declare-conflict-on-mytop-Closes-861913.patch - RC bug #861913: mariadb-client now provides MariaDB specific mytop, so proper Conflicts/Replaces against mytop was needed 0005-Add-upstream-patch-to-fix-assertion-failure-in-InnoD.patch 0007-Also-fix-the-same-assertion-failure-in-xtradb-Closes.patch - RC bug #862103: upstream patch to fix a critical assertion failure in InnoDB and XtraDB storage engine 0009-Remove-hard-Breaks-Replaces-with-mysql-server-and-my.patch 0010-Move-virtual-packages-from-Breaks-to-Conflicts-Debia.patch - Related to jessie->stretch mysql-transitional (#862410), there was a too aggressive Conflicts 0012-Use-etc-insserv.conf.d-mariadb-to-provide-database-s.patch - Move "Provides: $database" to /etc/insserv.conf.d/mariadb where it belongs. Cosmetic, but very annoying mistake. Sorry for that, that was my mistake in making invalid assumption. Cheers, Ondrej -- System Information: Debian Release: 9.0 APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.4.0-67-generic (SMP w/24 CPU cores) Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
>From a28d79265f9c89a580d13e525254ca46c8ac9444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@debian.org> Date: Thu, 4 May 2017 13:18:58 +0200 Subject: [PATCH 01/13] Remove two internal symbols (ll2str and longlong2str) from kfrebsd-amd64 symbols file --- debian/libmariadbclient18.symbols.Base | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/libmariadbclient18.symbols.Base b/debian/libmariadbclient18.symbols.Base index 956ce414..8b54792e 100644 --- a/debian/libmariadbclient18.symbols.Base +++ b/debian/libmariadbclient18.symbols.Base @@ -214,11 +214,9 @@ libmariadbclient.so.18 libmariadbclient18 #MINVER# list_length@Base 10.1.22 list_reverse@Base 10.1.22 list_walk@Base 10.1.22 - ll2str@Base 10.1.22 llstr@Base 10.1.22 load_defaults@Base 5.5.36 log_10_int@Base 10.1.22 - longlong10_to_str@Base 10.1.22 longlong2decimal@Base 10.1.22 make_password_from_salt@Base 10.1.22 make_password_from_salt_323@Base 10.1.22 -- 2.11.0
>From 6d528e1a5114b381cabfa1bc0d7eca8357594ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@debian.org>
Date: Mon, 8 May 2017 17:21:52 +0200
Subject: [PATCH 05/13] Add upstream patch to fix assertion failure in InnoDB
storage engine (Closes: #862103)
---
debian/patches/fix-innodb-assertion-failure.patch | 37 +++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 38 insertions(+)
create mode 100644 debian/patches/fix-innodb-assertion-failure.patch
diff --git a/debian/patches/fix-innodb-assertion-failure.patch b/debian/patches/fix-innodb-assertion-failure.patch
new file mode 100644
index 00000000..d60b9e92
--- /dev/null
+++ b/debian/patches/fix-innodb-assertion-failure.patch
@@ -0,0 +1,37 @@
+From 0241e1c1b216d87050cdfcb4531ffc17f9eb1dc7 Mon Sep 17 00:00:00 2001
+From: Thirunarayanan Balathandayuthapani
+ <thirunarayanan.balathandayuth@oracle.com>
+Date: Thu, 15 Dec 2016 15:38:06 +0530
+Subject: [PATCH] Bug #24585978 INNODB: ASSERTION TOTAL_RECS > 0 FAILURE
+ IN FILE DICT0STATS.CC
+
+Analysis:
+========
+ There was missing bracket for IF conditon in dict_stats_analyze_index_level()
+and it leads to wrong result.
+
+Fix:
+====
+ Fix the IF condition in dict_stats_analyze_index_level() so that it satisfied
+the if condtion only if level is zero.
+
+Reviewed-by : Jimmy Yang <jimmy.yang@oracle.com>
+---
+ storage/innobase/dict/dict0stats.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- mariadb-10.1.orig/storage/innobase/dict/dict0stats.cc
++++ mariadb-10.1/storage/innobase/dict/dict0stats.cc
+@@ -1168,10 +1168,10 @@ dict_stats_analyze_index_level(
+ leaf-level delete marks because delete marks on
+ non-leaf level do not make sense. */
+
+- if (level == 0 && srv_stats_include_delete_marked? 0:
++ if (level == 0 && (srv_stats_include_delete_marked ? 0:
+ rec_get_deleted_flag(
+ rec,
+- page_is_comp(btr_pcur_get_page(&pcur)))) {
++ page_is_comp(btr_pcur_get_page(&pcur))))) {
+
+ if (rec_is_last_on_page
+ && !prev_rec_is_copied
diff --git a/debian/patches/series b/debian/patches/series
index ecc2e43c..17b90b91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ armhf_mroonga_storage_fail.patch
c11_atomics.patch
remove-systemd-obsolete-target.patch
kFreeBSD-gettid.patch
+fix-innodb-assertion-failure.patch
--
2.11.0
>From a08c2fdc48352517451e2ee35271079da276a863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@debian.org>
Date: Mon, 8 May 2017 19:51:44 +0200
Subject: [PATCH 07/13] Also fix the same assertion failure in xtradb (Closes:
#862103)
---
debian/patches/fix-innodb-assertion-failure.patch | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/debian/patches/fix-innodb-assertion-failure.patch b/debian/patches/fix-innodb-assertion-failure.patch
index d60b9e92..1ab4571a 100644
--- a/debian/patches/fix-innodb-assertion-failure.patch
+++ b/debian/patches/fix-innodb-assertion-failure.patch
@@ -35,3 +35,18 @@ Reviewed-by : Jimmy Yang <jimmy.yang@oracle.com>
if (rec_is_last_on_page
&& !prev_rec_is_copied
+--- mariadb-10.1.orig/storage/xtradb/dict/dict0stats.cc
++++ mariadb-10.1/storage/xtradb/dict/dict0stats.cc
+@@ -1168,10 +1168,10 @@ dict_stats_analyze_index_level(
+ leaf-level delete marks because delete marks on
+ non-leaf level do not make sense. */
+
+- if (level == 0 && srv_stats_include_delete_marked? 0:
++ if (level == 0 && (srv_stats_include_delete_marked ? 0:
+ rec_get_deleted_flag(
+ rec,
+- page_is_comp(btr_pcur_get_page(&pcur)))) {
++ page_is_comp(btr_pcur_get_page(&pcur))))) {
+
+ if (rec_is_last_on_page
+ && !prev_rec_is_copied
--
2.11.0
>From e2c202636f98c362d747a45dc9de134246009b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@debian.org>
Date: Fri, 12 May 2017 12:18:23 +0200
Subject: [PATCH 09/13] Remove hard Breaks/Replaces with mysql-server and
mysql-client
---
debian/control | 4 ----
1 file changed, 4 deletions(-)
diff --git a/debian/control b/debian/control
index 61195932..e9bbde60 100644
--- a/debian/control
+++ b/debian/control
@@ -186,7 +186,6 @@ Conflicts: mysql-client-core-5.5,
Breaks: mariadb-client-10.0,
mariadb-client-5.5,
mariadb-server-10.0 (<< 10.0.13-1~),
- mysql-client,
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
@@ -194,7 +193,6 @@ Breaks: mariadb-client-10.0,
Replaces: mariadb-client-10.0,
mariadb-client-5.5,
mariadb-server-10.0 (<< 10.0.13-1~),
- mysql-client,
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
@@ -292,7 +290,6 @@ Breaks: mariadb-galera-server,
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-5.5,
mysql-client-5.5,
- mysql-server,
mysql-server-5.5,
mysql-server-5.6,
mysql-server-5.7,
@@ -306,7 +303,6 @@ Replaces: mariadb-galera-server,
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-5.5,
mysql-client-5.5,
- mysql-server,
mysql-server-5.5,
mysql-server-5.6,
mysql-server-5.7,
--
2.11.0
>From 49ecd78307e0ddc65ccb7464321e612e423ddce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@debian.org>
Date: Fri, 12 May 2017 12:21:30 +0200
Subject: [PATCH 10/13] Move virtual packages from Breaks to Conflicts (Debian
Policy 7.6.2)
---
debian/control | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/debian/control b/debian/control
index e9bbde60..fb7d55ea 100644
--- a/debian/control
+++ b/debian/control
@@ -148,14 +148,14 @@ Depends: mariadb-common (>= ${source:Version}),
${shlibs:Depends}
Conflicts: mysql-client-5.5,
mysql-client-5.6,
- mysql-client-5.7
+ mysql-client-5.7,
+ virtual-mysql-client-core
Breaks: mariadb-client-10.0 (<< 10.0.24-6~),
mariadb-client-core-10.0,
mariadb-client-core-5.5,
mysql-client-core-5.5,
mysql-client-core-5.6,
- mysql-client-core-5.7,
- virtual-mysql-client-core
+ mysql-client-core-5.7
Replaces: mariadb-client-10.0 (<< 10.0.24-6~),
mariadb-client-core-10.0,
mariadb-client-core-5.5,
@@ -182,21 +182,21 @@ Depends: debianutils (>=1.6),
Conflicts: mysql-client-core-5.5,
mysql-client-core-5.6,
mysql-client-core-5.7,
- mytop
+ mytop,
+ virtual-mysql-client
Breaks: mariadb-client-10.0,
mariadb-client-5.5,
mariadb-server-10.0 (<< 10.0.13-1~),
mysql-client-5.5,
mysql-client-5.6,
- mysql-client-5.7,
- virtual-mysql-client
+ mysql-client-5.7
Replaces: mariadb-client-10.0,
mariadb-client-5.5,
mariadb-server-10.0 (<< 10.0.13-1~),
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
- mytop,
+ mytop,
virtual-mysql-client
Provides: virtual-mysql-client
Recommends: libdbd-mysql-perl (>= 1.2202),
@@ -219,7 +219,8 @@ Depends: mariadb-common (>= ${source:Version}),
Conflicts: mariadb-galera-server-5.5,
mysql-server-5.5,
mysql-server-5.6,
- mysql-server-5.7
+ mysql-server-5.7,
+ virtual-mysql-server-core
Breaks: mariadb-client-10.1 (<< ${source:Version}),
mariadb-server-10.1 (<< ${source:Version}),
mariadb-server-core-10.0,
@@ -228,8 +229,7 @@ Breaks: mariadb-client-10.1 (<< ${source:Version}),
mysql-client-5.6,
mysql-server-core-5.5,
mysql-server-core-5.6,
- mysql-server-core-5.7,
- virtual-mysql-server-core
+ mysql-server-core-5.7
Replaces: mariadb-client-10.1 (<< ${source:Version}),
mariadb-server-10.1 (<< ${source:Version}),
mariadb-server-core-10.0,
@@ -280,7 +280,8 @@ Conflicts: mariadb-tokudb-engine-10.0,
mariadb-tokudb-engine-5.5,
mysql-server-core-5.5,
mysql-server-core-5.6,
- mysql-server-core-5.7
+ mysql-server-core-5.7,
+ virtual-mysql-server
Breaks: mariadb-galera-server,
mariadb-galera-server-10.0,
mariadb-galera-server-5.5,
@@ -292,8 +293,7 @@ Breaks: mariadb-galera-server,
mysql-client-5.5,
mysql-server-5.5,
mysql-server-5.6,
- mysql-server-5.7,
- virtual-mysql-server
+ mysql-server-5.7
Replaces: mariadb-galera-server,
mariadb-galera-server-10.0,
mariadb-galera-server-5.5,
@@ -478,6 +478,7 @@ Depends: libmariadbclient18 (= ${binary:Version}),
mariadb-client-10.1 (= ${binary:Version}),
mariadb-server-10.1 (= ${binary:Version}),
mariadb-test-data (= ${source:Version}),
+ virtual-mysql-testsuite,
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-test-10.0,
@@ -486,8 +487,7 @@ Breaks: mariadb-test-10.0,
mysql-testsuite,
mysql-testsuite-5.5,
mysql-testsuite-5.6,
- mysql-testsuite-5.7,
- virtual-mysql-testsuite
+ mysql-testsuite-5.7
Replaces: mariadb-test-10.0,
mariadb-test-10.1,
mariadb-test-5.5,
--
2.11.0
>From a43a3ee29cb3bfa13cf72ab319f2ab97f3e85d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@debian.org> Date: Sat, 13 May 2017 11:08:40 +0200 Subject: [PATCH 12/13] Use /etc/insserv.conf.d/mariadb to provide $database system facility (Closes: #862447) --- debian/mariadb-server-10.1.insserv.conf | 1 + debian/mariadb-server-10.1.install | 1 + debian/mariadb-server-10.1.mysql.init | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 debian/mariadb-server-10.1.insserv.conf diff --git a/debian/mariadb-server-10.1.insserv.conf b/debian/mariadb-server-10.1.insserv.conf new file mode 100644 index 00000000..cb29a547 --- /dev/null +++ b/debian/mariadb-server-10.1.insserv.conf @@ -0,0 +1 @@ +$database mysql diff --git a/debian/mariadb-server-10.1.install b/debian/mariadb-server-10.1.install index fa47d586..3b832df3 100755 --- a/debian/mariadb-server-10.1.install +++ b/debian/mariadb-server-10.1.install @@ -9,6 +9,7 @@ debian/additions/echo_stderr usr/share/mysql debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks +debian/mariadb-server-10.1.insserv.conf etc/insserv.conf.d/mariadb etc/apparmor.d/usr.sbin.mysqld [linux-any] lib/systemd/system/mariadb@.service [linux-any] lib/systemd/system/mariadb.service diff --git a/debian/mariadb-server-10.1.mysql.init b/debian/mariadb-server-10.1.mysql.init index 8b427943..c18ef8cd 100644 --- a/debian/mariadb-server-10.1.mysql.init +++ b/debian/mariadb-server-10.1.mysql.init @@ -1,7 +1,7 @@ #!/bin/bash # ### BEGIN INIT INFO -# Provides: $database mysql +# Provides: mysql # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Should-Start: $network $named $time -- 2.11.0
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: mariadb-10.1 Binary: libmariadbclient18, libmariadbclient-dev, libmariadbclient-dev-compat, libmariadbd18, libmariadbd-dev, mariadb-common, mariadb-client-core-10.1, mariadb-client-10.1, mariadb-server-core-10.1, mariadb-server-10.1, mariadb-server, mariadb-client, mariadb-plugin-connect, mariadb-plugin-oqgraph, mariadb-plugin-tokudb, mariadb-plugin-mroonga, mariadb-plugin-spider, mariadb-plugin-gssapi-server, mariadb-plugin-gssapi-client, mariadb-plugin-cracklib-password-check, mariadb-test, mariadb-test-data Architecture: any all Version: 10.1.23-8 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org> Uploaders: Otto Kekäläinen <otto@debian.org>, Arnaud Fontaine <arnau@debian.org>, Ondřej Surý <ondrej@debian.org> Homepage: https://mariadb.org/ Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/git/pkg-mysql/mariadb-10.1.git Vcs-Git: https://anonscm.debian.org/git/pkg-mysql/mariadb-10.1.git Testsuite: autopkgtest Build-Depends: bison, chrpath, cmake, debhelper (>= 9), dh-apparmor, dh-exec, dh-systemd, gdb, libaio-dev [linux-any], libarchive-dev, libboost-dev, libcrack2-dev (>= 2.9.0), libjemalloc-dev [linux-any], libjudy-dev, libkrb5-dev, libncurses5-dev (>= 5.0-6~), libpam0g-dev, libpcre3-dev (>= 2:8.35-3.2~), libreadline-gplv2-dev, libsystemd-dev, libxml2-dev, lsb-release, perl, po-debconf, psmisc, unixodbc-dev, zlib1g-dev (>= 1:1.1.3-5~) Package-List: libmariadbclient-dev deb libdevel optional arch=any libmariadbclient-dev-compat deb libdevel optional arch=any libmariadbclient18 deb libs optional arch=any libmariadbd-dev deb libdevel optional arch=any libmariadbd18 deb libs optional arch=any mariadb-client deb database optional arch=all mariadb-client-10.1 deb database optional arch=any mariadb-client-core-10.1 deb database optional arch=any mariadb-common deb database optional arch=all mariadb-plugin-connect deb database optional arch=any mariadb-plugin-cracklib-password-check deb database optional arch=any mariadb-plugin-gssapi-client deb database optional arch=any mariadb-plugin-gssapi-server deb database optional arch=any mariadb-plugin-mroonga deb database optional arch=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 mariadb-plugin-oqgraph deb database optional arch=any mariadb-plugin-spider deb database optional arch=any mariadb-plugin-tokudb deb database optional arch=amd64 mariadb-server deb database optional arch=all mariadb-server-10.1 deb database optional arch=any mariadb-server-core-10.1 deb database optional arch=any mariadb-test deb database optional arch=any mariadb-test-data deb database optional arch=all Checksums-Sha1: 59b07e45f99802a53ef20e04c616f652ad678c7c 61772244 mariadb-10.1_10.1.23.orig.tar.gz 9f91c7f07f1fe9b63060381b107bf6dc472debb4 221588 mariadb-10.1_10.1.23-8.debian.tar.xz Checksums-Sha256: 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf 61772244 mariadb-10.1_10.1.23.orig.tar.gz f2aa60d5bee1360e7094699c95e6b3c617f17c124043b40317a8d49f7dc4dd2e 221588 mariadb-10.1_10.1.23-8.debian.tar.xz Files: 1a7392cc05c7c249acd4495022719ca8 61772244 mariadb-10.1_10.1.23.orig.tar.gz 44bba96e4bf216361b47094f94de05d1 221588 mariadb-10.1_10.1.23-8.debian.tar.xz -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEMLkz2A/OPZgaLTj7DJm3DvT8uwcFAlkW0vBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDMw QjkzM0Q4MEZDRTNEOTgxQTJEMzhGQjBDOTlCNzBFRjRGQ0JCMDcACgkQDJm3DvT8 uwdObQ/8DqTiLBfooTXHBslXvRFFR+3g7zhYRcFpcyRpxBTiRbI1mvoAvwfkZY30 PVktCIMeE3LcpjOVvn+jSEQCh8v1/5z8YZbd6njCURW2ELv8Eo3sPm1skWc6hUpi oKhFyPbnmXwwA7ocOoXHUb5Q7IKAsmXfSekdv92Igxq/9exf/Kl0FhMjz0oHeBHD VEFfu2Us9w3dRZHaZNBnDFdbWrJDp9kg65yYX6cnK/6nk7GqRcc3Mfc5xplNTqen zzvv28+1M9RhwFJXHJG8oNv7DRpbnTbpEhoul5H5zbgpcptyNn3y6g5zxYnodRmR i3IJlcWbNbPIRMex1S7hmAUy+HAQu8VK+OGFcw+zljRLNf3AP+Wa+/j60bG4HKqE mbzivARHRuu8/OBS+wSsyT4C9++Ig6EAg2GbdgzOJ5E8Ljpp8pSYyDE/sVfDV5mE enDBNTGD7H2B4wmV9FsbV6H+qpP+mYsoUTF+iqUaV+Q3Qi8l4odJDOnMMSbN80KF GK6+ARZED2WixMxofoQ++gLbW6aEPiuBmCThOKg/Q0P14KkoBrfjXzFUA7dua6vy kRI+NpTuzsF1/bqEedj2WQ7izUZT1cQ9oxSrnw8toJD0WjuC7SDwvdftl59nUb52 +LmFIWb4ol9prLMXf6MXzUbmaEj0cPuufkLoJmtWPiQpWGywmHY= =cR/c -----END PGP SIGNATURE-----
diff -Nru mariadb-10.1-10.1.23/debian/changelog mariadb-10.1-10.1.23/debian/changelog
--- mariadb-10.1-10.1.23/debian/changelog 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/changelog 2017-05-13 11:08:43.000000000 +0200
@@ -1,3 +1,43 @@
+mariadb-10.1 (10.1.23-8) unstable; urgency=medium
+
+ * Use /etc/insserv.conf.d/mariadb to provide $database system facility
+ (Closes: #862447)
+
+ -- Ondřej Surý <ondrej@debian.org> Sat, 13 May 2017 11:08:43 +0200
+
+mariadb-10.1 (10.1.23-7) unstable; urgency=medium
+
+ * Remove hard Breaks/Replaces with mysql-server and mysql-client
+ * Move virtual packages from Breaks to Conflicts (Debian Policy 7.6.2)
+
+ -- Ondřej Surý <ondrej@debian.org> Fri, 12 May 2017 12:21:33 +0200
+
+mariadb-10.1 (10.1.23-6) unstable; urgency=medium
+
+ * Also fix the same assertion failure in xtradb (Closes: #862103)
+
+ -- Ondřej Surý <ondrej@debian.org> Mon, 08 May 2017 19:51:47 +0200
+
+mariadb-10.1 (10.1.23-5) unstable; urgency=medium
+
+ * Add upstream patch to fix assertion failure in InnoDB storage engine
+ (Closes: #862103)
+
+ -- Ondřej Surý <ondrej@debian.org> Mon, 08 May 2017 17:21:55 +0200
+
+mariadb-10.1 (10.1.23-4) unstable; urgency=medium
+
+ * Properly declare conflict on mytop (Closes: #861913)
+
+ -- Ondřej Surý <ondrej@debian.org> Mon, 08 May 2017 11:31:13 +0200
+
+mariadb-10.1 (10.1.23-3) unstable; urgency=medium
+
+ * Remove two internal symbols (ll2str and longlong2str) from
+ kfrebsd-amd64 symbols file
+
+ -- Ondřej Surý <ondrej@debian.org> Thu, 04 May 2017 13:19:00 +0200
+
mariadb-10.1 (10.1.23-2) unstable; urgency=medium
* Add CVE list for 10.1.23 release
diff -Nru mariadb-10.1-10.1.23/debian/control mariadb-10.1-10.1.23/debian/control
--- mariadb-10.1-10.1.23/debian/control 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/control 2017-05-13 11:08:43.000000000 +0200
@@ -148,14 +148,14 @@
${shlibs:Depends}
Conflicts: mysql-client-5.5,
mysql-client-5.6,
- mysql-client-5.7
+ mysql-client-5.7,
+ virtual-mysql-client-core
Breaks: mariadb-client-10.0 (<< 10.0.24-6~),
mariadb-client-core-10.0,
mariadb-client-core-5.5,
mysql-client-core-5.5,
mysql-client-core-5.6,
- mysql-client-core-5.7,
- virtual-mysql-client-core
+ mysql-client-core-5.7
Replaces: mariadb-client-10.0 (<< 10.0.24-6~),
mariadb-client-core-10.0,
mariadb-client-core-5.5,
@@ -181,22 +181,22 @@
${shlibs:Depends}
Conflicts: mysql-client-core-5.5,
mysql-client-core-5.6,
- mysql-client-core-5.7
+ mysql-client-core-5.7,
+ mytop,
+ virtual-mysql-client
Breaks: mariadb-client-10.0,
mariadb-client-5.5,
mariadb-server-10.0 (<< 10.0.13-1~),
- mysql-client,
mysql-client-5.5,
mysql-client-5.6,
- mysql-client-5.7,
- virtual-mysql-client
+ mysql-client-5.7
Replaces: mariadb-client-10.0,
mariadb-client-5.5,
mariadb-server-10.0 (<< 10.0.13-1~),
- mysql-client,
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
+ mytop,
virtual-mysql-client
Provides: virtual-mysql-client
Recommends: libdbd-mysql-perl (>= 1.2202),
@@ -219,7 +219,8 @@
Conflicts: mariadb-galera-server-5.5,
mysql-server-5.5,
mysql-server-5.6,
- mysql-server-5.7
+ mysql-server-5.7,
+ virtual-mysql-server-core
Breaks: mariadb-client-10.1 (<< ${source:Version}),
mariadb-server-10.1 (<< ${source:Version}),
mariadb-server-core-10.0,
@@ -228,8 +229,7 @@
mysql-client-5.6,
mysql-server-core-5.5,
mysql-server-core-5.6,
- mysql-server-core-5.7,
- virtual-mysql-server-core
+ mysql-server-core-5.7
Replaces: mariadb-client-10.1 (<< ${source:Version}),
mariadb-server-10.1 (<< ${source:Version}),
mariadb-server-core-10.0,
@@ -280,7 +280,8 @@
mariadb-tokudb-engine-5.5,
mysql-server-core-5.5,
mysql-server-core-5.6,
- mysql-server-core-5.7
+ mysql-server-core-5.7,
+ virtual-mysql-server
Breaks: mariadb-galera-server,
mariadb-galera-server-10.0,
mariadb-galera-server-5.5,
@@ -290,11 +291,9 @@
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-5.5,
mysql-client-5.5,
- mysql-server,
mysql-server-5.5,
mysql-server-5.6,
- mysql-server-5.7,
- virtual-mysql-server
+ mysql-server-5.7
Replaces: mariadb-galera-server,
mariadb-galera-server-10.0,
mariadb-galera-server-5.5,
@@ -304,7 +303,6 @@
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-5.5,
mysql-client-5.5,
- mysql-server,
mysql-server-5.5,
mysql-server-5.6,
mysql-server-5.7,
@@ -480,6 +478,7 @@
mariadb-client-10.1 (= ${binary:Version}),
mariadb-server-10.1 (= ${binary:Version}),
mariadb-test-data (= ${source:Version}),
+ virtual-mysql-testsuite,
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-test-10.0,
@@ -488,8 +487,7 @@
mysql-testsuite,
mysql-testsuite-5.5,
mysql-testsuite-5.6,
- mysql-testsuite-5.7,
- virtual-mysql-testsuite
+ mysql-testsuite-5.7
Replaces: mariadb-test-10.0,
mariadb-test-10.1,
mariadb-test-5.5,
diff -Nru mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.Base mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.Base
--- mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.Base 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.Base 2017-05-13 11:08:43.000000000 +0200
@@ -214,11 +214,9 @@
list_length@Base 10.1.22
list_reverse@Base 10.1.22
list_walk@Base 10.1.22
- ll2str@Base 10.1.22
llstr@Base 10.1.22
load_defaults@Base 5.5.36
log_10_int@Base 10.1.22
- longlong10_to_str@Base 10.1.22
longlong2decimal@Base 10.1.22
make_password_from_salt@Base 10.1.22
make_password_from_salt_323@Base 10.1.22
diff -Nru mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.hurd-i386 mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.hurd-i386
--- mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.hurd-i386 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.hurd-i386 2017-05-13 11:08:43.000000000 +0200
@@ -214,11 +214,9 @@
list_length@Base 10.1.22
list_reverse@Base 10.1.22
list_walk@Base 10.1.22
- ll2str@Base 10.1.22
llstr@Base 10.1.22
load_defaults@Base 5.5.36
log_10_int@Base 10.1.22
- longlong10_to_str@Base 10.1.22
longlong2decimal@Base 10.1.22
make_password_from_salt@Base 10.1.22
make_password_from_salt_323@Base 10.1.22
diff -Nru mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.kfreebsd-amd64 mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.kfreebsd-amd64
--- mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.kfreebsd-amd64 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/libmariadbclient18.symbols.kfreebsd-amd64 2017-05-13 11:08:43.000000000 +0200
@@ -214,11 +214,9 @@
list_length@Base 10.1.22
list_reverse@Base 10.1.22
list_walk@Base 10.1.22
- ll2str@Base 10.1.22
llstr@Base 10.1.22
load_defaults@Base 5.5.36
log_10_int@Base 10.1.22
- longlong10_to_str@Base 10.1.22
longlong2decimal@Base 10.1.22
make_password_from_salt@Base 10.1.22
make_password_from_salt_323@Base 10.1.22
diff -Nru mariadb-10.1-10.1.23/debian/mariadb-server-10.1.insserv.conf mariadb-10.1-10.1.23/debian/mariadb-server-10.1.insserv.conf
--- mariadb-10.1-10.1.23/debian/mariadb-server-10.1.insserv.conf 1970-01-01 01:00:00.000000000 +0100
+++ mariadb-10.1-10.1.23/debian/mariadb-server-10.1.insserv.conf 2017-05-13 11:08:43.000000000 +0200
@@ -0,0 +1 @@
+$database mysql
diff -Nru mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install
--- mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install 2017-05-13 11:08:43.000000000 +0200
@@ -9,6 +9,7 @@
debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks
+debian/mariadb-server-10.1.insserv.conf etc/insserv.conf.d/mariadb
etc/apparmor.d/usr.sbin.mysqld
[linux-any] lib/systemd/system/mariadb@.service
[linux-any] lib/systemd/system/mariadb.service
diff -Nru mariadb-10.1-10.1.23/debian/mariadb-server-10.1.mysql.init mariadb-10.1-10.1.23/debian/mariadb-server-10.1.mysql.init
--- mariadb-10.1-10.1.23/debian/mariadb-server-10.1.mysql.init 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/mariadb-server-10.1.mysql.init 2017-05-13 11:08:43.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
#
### BEGIN INIT INFO
-# Provides: $database mysql
+# Provides: mysql
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Should-Start: $network $named $time
diff -Nru mariadb-10.1-10.1.23/debian/patches/fix-innodb-assertion-failure.patch mariadb-10.1-10.1.23/debian/patches/fix-innodb-assertion-failure.patch
--- mariadb-10.1-10.1.23/debian/patches/fix-innodb-assertion-failure.patch 1970-01-01 01:00:00.000000000 +0100
+++ mariadb-10.1-10.1.23/debian/patches/fix-innodb-assertion-failure.patch 2017-05-13 11:08:43.000000000 +0200
@@ -0,0 +1,52 @@
+From 0241e1c1b216d87050cdfcb4531ffc17f9eb1dc7 Mon Sep 17 00:00:00 2001
+From: Thirunarayanan Balathandayuthapani
+ <thirunarayanan.balathandayuth@oracle.com>
+Date: Thu, 15 Dec 2016 15:38:06 +0530
+Subject: [PATCH] Bug #24585978 INNODB: ASSERTION TOTAL_RECS > 0 FAILURE
+ IN FILE DICT0STATS.CC
+
+Analysis:
+========
+ There was missing bracket for IF conditon in dict_stats_analyze_index_level()
+and it leads to wrong result.
+
+Fix:
+====
+ Fix the IF condition in dict_stats_analyze_index_level() so that it satisfied
+the if condtion only if level is zero.
+
+Reviewed-by : Jimmy Yang <jimmy.yang@oracle.com>
+---
+ storage/innobase/dict/dict0stats.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- mariadb-10.1.orig/storage/innobase/dict/dict0stats.cc
++++ mariadb-10.1/storage/innobase/dict/dict0stats.cc
+@@ -1168,10 +1168,10 @@ dict_stats_analyze_index_level(
+ leaf-level delete marks because delete marks on
+ non-leaf level do not make sense. */
+
+- if (level == 0 && srv_stats_include_delete_marked? 0:
++ if (level == 0 && (srv_stats_include_delete_marked ? 0:
+ rec_get_deleted_flag(
+ rec,
+- page_is_comp(btr_pcur_get_page(&pcur)))) {
++ page_is_comp(btr_pcur_get_page(&pcur))))) {
+
+ if (rec_is_last_on_page
+ && !prev_rec_is_copied
+--- mariadb-10.1.orig/storage/xtradb/dict/dict0stats.cc
++++ mariadb-10.1/storage/xtradb/dict/dict0stats.cc
+@@ -1168,10 +1168,10 @@ dict_stats_analyze_index_level(
+ leaf-level delete marks because delete marks on
+ non-leaf level do not make sense. */
+
+- if (level == 0 && srv_stats_include_delete_marked? 0:
++ if (level == 0 && (srv_stats_include_delete_marked ? 0:
+ rec_get_deleted_flag(
+ rec,
+- page_is_comp(btr_pcur_get_page(&pcur)))) {
++ page_is_comp(btr_pcur_get_page(&pcur))))) {
+
+ if (rec_is_last_on_page
+ && !prev_rec_is_copied
diff -Nru mariadb-10.1-10.1.23/debian/patches/series mariadb-10.1-10.1.23/debian/patches/series
--- mariadb-10.1-10.1.23/debian/patches/series 2017-05-04 10:55:06.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/patches/series 2017-05-13 11:08:43.000000000 +0200
@@ -18,3 +18,4 @@
c11_atomics.patch
remove-systemd-obsolete-target.patch
kFreeBSD-gettid.patch
+fix-innodb-assertion-failure.patch
Attachment:
mariadb-10.1_10.1.23-8.debian.tar.xz
Description: application/xz
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 13 May 2017 11:08:43 +0200
Source: mariadb-10.1
Binary: libmariadbclient18 libmariadbclient-dev libmariadbclient-dev-compat libmariadbd18 libmariadbd-dev mariadb-common mariadb-client-core-10.1 mariadb-client-10.1 mariadb-server-core-10.1 mariadb-server-10.1 mariadb-server mariadb-client mariadb-plugin-connect mariadb-plugin-oqgraph mariadb-plugin-tokudb mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-test mariadb-test-data
Architecture: source
Version: 10.1.23-8
Distribution: unstable
Urgency: medium
Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
Changed-By: Ondřej Surý <ondrej@debian.org>
Description:
libmariadbclient-dev - MariaDB database development files
libmariadbclient-dev-compat - MariaDB database development files (libmysqlclient compatibility)
libmariadbclient18 - MariaDB database client library
libmariadbd-dev - MariaDB embedded database, development files
libmariadbd18 - MariaDB embedded database, shared library
mariadb-client - MariaDB database client (metapackage depending on the latest vers
mariadb-client-10.1 - MariaDB database client binaries
mariadb-client-core-10.1 - MariaDB database core client binaries
mariadb-common - MariaDB common metapackage
mariadb-plugin-connect - Connect storage engine for MariaDB
mariadb-plugin-cracklib-password-check - CrackLib Password Validation Plugin for MariaDB
mariadb-plugin-gssapi-client - GSSAPI authentication plugin for MariaDB client
mariadb-plugin-gssapi-server - GSSAPI authentication plugin for MariaDB server
mariadb-plugin-mroonga - Mroonga storage engine for MariaDB
mariadb-plugin-oqgraph - OQGraph storage engine for MariaDB
mariadb-plugin-spider - Spider storage engine for MariaDB
mariadb-plugin-tokudb - TokuDB storage engine for MariaDB
mariadb-server - MariaDB database server (metapackage depending on the latest vers
mariadb-server-10.1 - MariaDB database server binaries
mariadb-server-core-10.1 - MariaDB database core server files
mariadb-test - MariaDB database regression test suite
mariadb-test-data - MariaDB database regression test suite - data files
Closes: 862447
Changes:
mariadb-10.1 (10.1.23-8) unstable; urgency=medium
.
* Use /etc/insserv.conf.d/mariadb to provide $database system facility
(Closes: #862447)
Checksums-Sha1:
c1623c4ec96407865bcb69b8424653ace178ba49 4384 mariadb-10.1_10.1.23-8.dsc
9f91c7f07f1fe9b63060381b107bf6dc472debb4 221588 mariadb-10.1_10.1.23-8.debian.tar.xz
fe01f10db3f21721ed0dbfcccf0c3c16e7b16a23 19726 mariadb-10.1_10.1.23-8_amd64.buildinfo
Checksums-Sha256:
0aba04a220ece7663880d2690da94f4411e04131e1e4dddc4c62d339c3737af6 4384 mariadb-10.1_10.1.23-8.dsc
f2aa60d5bee1360e7094699c95e6b3c617f17c124043b40317a8d49f7dc4dd2e 221588 mariadb-10.1_10.1.23-8.debian.tar.xz
c6a44eabbc0a05fef277b281864c4702018bfbb2e341572b2fd061ac7dd043fe 19726 mariadb-10.1_10.1.23-8_amd64.buildinfo
Files:
f954f45ddf29b5285912ffb6518f6709 4384 database optional mariadb-10.1_10.1.23-8.dsc
44bba96e4bf216361b47094f94de05d1 221588 database optional mariadb-10.1_10.1.23-8.debian.tar.xz
9bde900ec79078d56699c6a97cf2b073 19726 database optional mariadb-10.1_10.1.23-8_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEEMLkz2A/OPZgaLTj7DJm3DvT8uwcFAlkW0vFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDMw
QjkzM0Q4MEZDRTNEOTgxQTJEMzhGQjBDOTlCNzBFRjRGQ0JCMDcACgkQDJm3DvT8
uwdnsg/8Dh3UVeuQAcz8WX2YUmWkDaFc2GgRSB+mzYKCR9vflxMsSBzH74ZUMCc2
SEen+5YBwIX3UGk0A1NeRT1+QI27gLsO4ddak0IdnTD/W9iVMoiQAi4FAfVyyFU5
pnH/B41reV13KYhp3HRwNZLM9aPRHeY3QCEgjdNDHGD8Nh4Mm4kQb6ltbJTkUPDq
9d+uywkaSUOov3j+AYeGEuHxAjPlUDUTfYW+ZSYbOSpXwKxNcs1YOvZOlhNdsxrY
YXSzDw6ky3CMEjDq1NBFRQrXYK21rlZM2NnxTr4OHVPYU0twkcIbXkum0NwR3zCJ
T1d+n0u+0DiJh9ncdvVWEHmvJKJN1WhlKUPR+ZUNVuZo70UngUKto/dB2ySUSaD3
tv0FAQy1fg/ZrCF1DNOfR/bQsiNcjE6vjQ78dcSED29ScbbIgtCsza3rnuYZyIoP
m/cM6f0XIh/rdSOEQAx04yP9hXRcfhVRJLd2566zRF+mePZOfCtZL++8rbaGqONX
Pk9b3Xi9AB7VwWKF8M/IBUbupISzdj5BsChpKG/+iZ8t19zLRV/MxBt6OWRiA+IT
xjTGQWxeYUwPxB+ou1iWLFnW8UmmmoUlByz86fr3GuWoOl8iEQThmZl275i/2nMA
2gy0ExA/RcIcBBerU4uR3g4R39054OLhT19lZHqwjvOKP4So/6o=
=dLiK
-----END PGP SIGNATURE-----