Skip to content
Snippets Groups Projects
Commit 8675e972 authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Otto Kekäläinen
Browse files

Complement upstream commits with more complete mysql->mariadb conversion

The upstream commit 952af4a1 missed some places where 'mysql'
or 'MySQL' can and should be converted to use 'mariadb' or 'MariaDB'.
parent a0518074
No related branches found
No related tags found
1 merge request!49Sync downstream (where applicable) with upstream 10.11 debian/* contents and extend similar changes to make them complete
......@@ -54,7 +54,7 @@ function upgrade_system_tables_if_necessary() {
set -e
set -u
logger -p daemon.info -i -t"$0" "Upgrading MySQL tables if necessary."
logger -p daemon.info -i -t"$0" "Upgrading MariaDB tables if necessary."
# Filter all "duplicate column", "duplicate key" and "unknown column"
# errors as the script is designed to be idempotent.
......
......@@ -3,7 +3,7 @@
set -e
# Install Mroonga
mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true
mariadb --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true
# Always exit with success instead of leaving dpkg in a broken state
......
......@@ -3,7 +3,7 @@
set -e
# Uninstall Mroonga
mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true
mariadb --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true
# Always exit with success instead of leaving dpkg in a broken state
......
......@@ -8,7 +8,7 @@
# Should-Stop: $network $named $time
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start and stop the mysql database server daemon
# Short-Description: Start and stop the MariaDB database server daemon
# Description: Controls the main MariaDB database server daemon "mariadbd"
# and its wrapper script "mysqld_safe".
### END INIT INFO
......
......@@ -169,7 +169,7 @@ fi
#
# Now we have to ensure the following state:
# /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false
# /etc/passwd: mysql:x:100:101:MariaDB Server:/nonexistent:/bin/false
# /etc/group: mysql:x:101:
#
# Sadly there could any state be present on the system so we have to
......@@ -192,7 +192,7 @@ if ! getent passwd mysql >/dev/null; then
--ingroup mysql \
--no-create-home \
--home /nonexistent \
--gecos "MySQL Server" \
--gecos "MariaDB Server" \
--shell /bin/false \
mysql >/dev/null 2>&1
fi
......
......@@ -236,7 +236,7 @@ override_dh_systemd_enable:
# dh_systemd_enable --no-enable --name=mariadb@ mariadb.socket
# dh_systemd_enable --no-enable --name=mariadb-extra@ mariadb-extra.socket
# Start mysql at sequence number 19 before 20 where apache, proftpd etc gets
# Start mariadbd at sequence number 19 before 20 where apache, proftpd etc gets
# started which might depend on a running database server.
override_dh_installinit-arch:
dh_installinit --name=mariadb --no-start -- defaults 19 21
......
......@@ -97,7 +97,7 @@ if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] &&
LOG=/var/lib/mysql/#rocksdb/LOG
# XXX: The server may only be started during the install of
# mariadb-server, which happens before that of the plugin.
[ -e $LOG ] || mysql -e "INSTALL PLUGIN RocksDB SONAME 'ha_rocksdb';"
[ -e $LOG ] || mariadb -e "INSTALL PLUGIN RocksDB SONAME 'ha_rocksdb';"
# XXX: rocksdb_supported_compression_types variable does not report ZSTD.
# Print RocksDB supported items so test log is easier to debug
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment