Merge ~paride/ubuntu/+source/mysql-5.7:lp1882527-sru-bionic into ubuntu/+source/mysql-5.7:ubuntu/bionic-devel

Proposed by Paride Legovini
Status: Merged
Approved by: Utkarsh Gupta
Approved revision: 9fc7151adfdc2ccb5b9b60b842cc2b8eb11d4ac5
Merge reported by: Paride Legovini
Merged at revision: 9fc7151adfdc2ccb5b9b60b842cc2b8eb11d4ac5
Proposed branch: ~paride/ubuntu/+source/mysql-5.7:lp1882527-sru-bionic
Merge into: ubuntu/+source/mysql-5.7:ubuntu/bionic-devel
Diff against target: 30 lines (+10/-1)
2 files modified
debian/changelog (+9/-0)
debian/mysql-server-5.7.mysql.service (+1/-1)
Reviewer Review Type Date Requested Status
Utkarsh Gupta (community) Approve
Canonical Server Core Reviewers Pending
Canonical Server Pending
Review via email: mp+407446@code.launchpad.net

Commit message

No-change backport of the fix for LP: #1882527 released with mysql-8.0 8.0.22-1 (in >=Hirsute) to mysql-5.7/bionic.

Test PPA: https://launchpad.net/~paride/+archive/ubuntu/mysql-lp1882527

Test plan: see https://bugs.launchpad.net/ubuntu/+source/mysql-5.7/+bug/1882527

Please review & sponsor!

--- Test results ---

# time systemctl start mysql
real 12m24.021s
user 0m0.006s
sys 0m0.016s

# systemctl is-active mysql
active

--- Autopkgtest results ---

autopkgtest [13:02:02]: @@@@@@@@@@@@@@@@@@@@ summary
smoke PASS
upstream PASS

To post a comment you must log in.
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Thanks, I'll take a look at this.

Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Looks good, matches what's in Debian, et al. Thanks for working on this, Paride.

review: Approve
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

$ dput ubuntu ../mysql-5.7_5.7.35-0ubuntu0.18.04.2_source.changes
Checking signature on .changes
gpg: ../mysql-5.7_5.7.35-0ubuntu0.18.04.2_source.changes: Valid signature from 823E967606C34B96
Checking signature on .dsc
gpg: ../mysql-5.7_5.7.35-0ubuntu0.18.04.2.dsc: Valid signature from 823E967606C34B96
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading mysql-5.7_5.7.35-0ubuntu0.18.04.2.dsc: done.
  Uploading mysql-5.7_5.7.35-0ubuntu0.18.04.2.debian.tar.xz: done.
  Uploading mysql-5.7_5.7.35-0ubuntu0.18.04.2_source.buildinfo: done.
  Uploading mysql-5.7_5.7.35-0ubuntu0.18.04.2_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3da81d9..0644ba1 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,12 @@
6+mysql-5.7 (5.7.35-0ubuntu0.18.04.2) bionic; urgency=medium
7+
8+ * d/systemd: Disable service timeout
9+ For large databases, the service could timeout on stop, possibly
10+ leading to data corruption during a system shutdown.
11+ (LP: #1882527)
12+
13+ -- Paride Legovini <paride@ubuntu.com> Thu, 19 Aug 2021 18:34:52 +0200
14+
15 mysql-5.7 (5.7.35-0ubuntu0.18.04.1) bionic-security; urgency=medium
16
17 * SECURITY UPDATE: Update to 5.7.34 to fix security issues
18diff --git a/debian/mysql-server-5.7.mysql.service b/debian/mysql-server-5.7.mysql.service
19index 258d7f5..eadc7d5 100644
20--- a/debian/mysql-server-5.7.mysql.service
21+++ b/debian/mysql-server-5.7.mysql.service
22@@ -15,7 +15,7 @@ PIDFile=/run/mysqld/mysqld.pid
23 PermissionsStartOnly=true
24 ExecStartPre=/usr/share/mysql/mysql-systemd-start pre
25 ExecStart=/usr/sbin/mysqld --daemonize --pid-file=/run/mysqld/mysqld.pid
26-TimeoutSec=600
27+TimeoutSec=infinity
28 Restart=on-failure
29 RuntimeDirectory=mysqld
30 RuntimeDirectoryMode=755

Subscribers

People subscribed via source and target branches