Page MenuHomeSolus

Update mariadb to 10.4.6
Needs ReviewPublic

Authored by livingsilver94 on Mon, Jul 1, 9:12 AM.

Details

Reviewers
JoshStrobl
Group Reviewers
Triage Team
Maniphest Tasks
T4337: mariadb: Missing mysql_install_db
Summary

Changelog:
Release notes available here starting from version 10.3.14.

Package changes:

  • Move mariadb_first_install into mariadb-server package
  • Make MariaDB stateless
  • Minor fixes to package descriptions

Fixes T4337.

Test Plan

mariadb_first_install works if /var/db/mysql does not exist.

sudo systemctl start mariadb
nmap -sT localhost
# Port 3306/tcp is open
# Create /etc/mysql/my.cnf.d/test.cnf with
# [client-server]
# port = 4567
sudo systemctl restart mariadb
nmap -sT localhost
# Port 4567/tcp is open, 3306/tcp is not

mysqld --print-defaults correctly shows flags manually set in /usr/share/defaults/mysql/my.cnf.d/server.cnf.

Diff Detail

Repository
R2019 mariadb
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
livingsilver94 created this revision.Mon, Jul 1, 9:12 AM
livingsilver94 requested review of this revision.Mon, Jul 1, 9:12 AM
livingsilver94 edited the test plan for this revision. (Show Details)Mon, Jul 1, 9:12 AM
livingsilver94 edited the test plan for this revision. (Show Details)
livingsilver94 edited the test plan for this revision. (Show Details)Mon, Jul 1, 9:17 AM

No AppArmor profiles for now. And they were in the wrong directory anyway.

livingsilver94 edited the summary of this revision. (Show Details)Mon, Jul 1, 9:55 AM
livingsilver94 retitled this revision from Make mariadb stateless and move mariadb_first_install into mariadb-server to Make mariadb stateless; move mariadb_first_install into mariadb-server.
livingsilver94 edited the summary of this revision. (Show Details)
JoshStrobl requested changes to this revision.Tue, Jul 2, 5:29 PM
JoshStrobl added a subscriber: JoshStrobl.
JoshStrobl added inline comments.
package.yml
5

We should probably get this updated to 10.4.6-GA while we're at it.

98–125

I get the whole idea with why you aligned them, but honestly 4 spaces probably would be sufficient.

This revision now requires changes to proceed.Tue, Jul 2, 5:29 PM
livingsilver94 marked an inline comment as done.Tue, Jul 2, 7:10 PM

Update to 10.4.6 (I hate you Josh >.>)

livingsilver94 retitled this revision from Make mariadb stateless; move mariadb_first_install into mariadb-server to Update mariadb to 10.4.6.Tue, Jul 2, 10:05 PM
livingsilver94 edited the summary of this revision. (Show Details)
livingsilver94 marked an inline comment as done.

Remove useless whitespace edit for the patch file

Make sure to read from /usr/share/defaults/mysql/my.cnf.d; restore old patch

livingsilver94 edited the test plan for this revision. (Show Details)Wed, Jul 3, 10:07 PM

I think we should remove the service file for multiple instances of mariadb (which is also not patched to run mariadb_first_install). What's your opinion?

I think we should remove the service file for multiple instances of mariadb (which is also not patched to run mariadb_first_install). What's your opinion?

Which service files are you talking about specifically? systemd has a ExecStartPre key for systemd services that we should preferably use for the services to have it run before ExecStart

livingsilver94 added inline comments.Thu, Jul 11, 3:03 PM
pspec_x86_64.xml
879–880

@JoshStrobl this one. This service is not patched and it's meant to support multiple mariadb instances simultaneously.

JoshStrobl added inline comments.Thu, Jul 11, 3:25 PM
pspec_x86_64.xml
879–880

Ah. Yea I'd nuke it.

Remove multi-instances service

livingsilver94 marked an inline comment as done.Thu, Jul 11, 5:10 PM