diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:50:58 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:50:58 +0200 |
commit | 820ebcec8651d2478ece554f059a5513f0b2bedf (patch) | |
tree | 2a4b43a9f104782fa9211e8622bc7d50a992f802 /debian | |
parent | 0225159a8d0e1260bfec7219b584523097a74d4b (diff) | |
parent | 92c8d6f168f329bf7e3998a4f580781d0239b59a (diff) | |
download | mariadb-git-820ebcec8651d2478ece554f059a5513f0b2bedf.tar.gz |
Merge 10.8 into 10.9
Diffstat (limited to 'debian')
-rw-r--r-- | debian/mariadb-server.mariadb.init | 8 | ||||
-rw-r--r-- | debian/tests/smoke | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/debian/mariadb-server.mariadb.init b/debian/mariadb-server.mariadb.init index 8417ea74852..cc004179894 100644 --- a/debian/mariadb-server.mariadb.init +++ b/debian/mariadb-server.mariadb.init @@ -34,6 +34,12 @@ else exit -1 fi +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" @@ -127,7 +133,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 8b384c80c2f..b3e09acc8ae 100644 --- a/debian/tests/smoke +++ b/debian/tests/smoke @@ -45,28 +45,28 @@ else systemctl restart mariadb 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 @@ -94,7 +94,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 |