diff options
author | Daniel Black <daniel@mariadb.org> | 2022-12-16 15:51:38 +0000 |
---|---|---|
committer | Daniel Black <daniel@mariadb.org> | 2023-01-03 11:25:10 +1100 |
commit | c4938eafc594d6d64e5a17be13c337ada0beb63d (patch) | |
tree | e943d8e51a8dc91079741ca918340025814d13a5 /debian | |
parent | fd6f19d7321e8c58ecabf58fbfb7943ce62f3536 (diff) | |
download | mariadb-git-c4938eafc594d6d64e5a17be13c337ada0beb63d.tar.gz |
MDEV-30275: mariadb names rather than mysql names should be used
* mariadb-service-convert to use mariadbd-safe
* galera_recovery to use mariadbd
* mtr - wsrep use mariadb executables
* debian/mariadb-server.mariadb.init use mariadbd-safe
* debian/tests/smoke uses mariadb instead of mysql as client.
Co-Author: Daniel Black <daniel@mariadb.org>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/mariadb-server-10.5.mariadb.init | 8 | ||||
-rw-r--r-- | debian/tests/smoke | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/debian/mariadb-server-10.5.mariadb.init b/debian/mariadb-server-10.5.mariadb.init index d2c5c64165a..ca0ee9762db 100644 --- a/debian/mariadb-server-10.5.mariadb.init +++ b/debian/mariadb-server-10.5.mariadb.init @@ -25,6 +25,12 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" +if [ ! -x /usr/bin/mariadbd-safe ] +then + log_failure_msg "/usr/bin/mariadbd-safe not found or executable! This SysV init script depends on it." + exit -1 +fi + # priority can be overridden and "-s" adds output to stderr ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mariadb -i" @@ -118,7 +124,7 @@ case "${1:-''}" in test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld # Start MariaDB! - /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & + /usr/bin/mariadbd-safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do sleep 1 diff --git a/debian/tests/smoke b/debian/tests/smoke index 4e06feae20c..59185ede314 100644 --- a/debian/tests/smoke +++ b/debian/tests/smoke @@ -40,28 +40,28 @@ else echo "Found systemctl, continuing smoke test.." fi -mysql <<EOT +mariadb <<EOT CREATE DATABASE testdatabase; CREATE USER 'testuser'@'localhost' identified by 'testpassword'; GRANT ALL ON testdatabase.* TO 'testuser'@'localhost'; EOT -mysql testdatabase <<EOT +mariadb testdatabase <<EOT CREATE TABLE foo (bar INTEGER); INSERT INTO foo (bar) VALUES (41); EOT -result=$(echo 'SELECT bar+1 FROM foo;'|mysql --batch --skip-column-names --user=testuser --password=testpassword testdatabase) +result=$(echo 'SELECT bar+1 FROM foo;'|mariadb --batch --skip-column-names --user=testuser --password=testpassword testdatabase) if [ "$result" != "42" ]; then echo "Unexpected result" >&2 exit 1 fi -mysql --user=testuser --password=testpassword testdatabase <<EOT +mariadb --user=testuser --password=testpassword testdatabase <<EOT DROP TABLE foo; EOT -mysql <<EOT +mariadb <<EOT DROP DATABASE testdatabase; DROP USER 'testuser'@'localhost'; EOT @@ -89,7 +89,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-10.5, 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 |