mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
MDEV-33750: Brand some mysql stuff to mariadb
As is everywhere in mariadbd is used it more than convienient to use mariadbd-safe than mysql_safe in init script also in upstream test use output mariadb-test-run-junit.xml than mysql-test-run-junit.xml
This commit is contained in:
parent
c22d01c91d
commit
d94f34c1ed
2 changed files with 3 additions and 3 deletions
4
debian/mariadb-server.mariadb.init
vendored
4
debian/mariadb-server.mariadb.init
vendored
|
@ -10,7 +10,7 @@
|
|||
# Default-Stop: 0 1 6
|
||||
# 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".
|
||||
# and its wrapper script "mariadbd-safe".
|
||||
### END INIT INFO
|
||||
#
|
||||
set -e
|
||||
|
@ -216,7 +216,7 @@ case "${1:-''}" in
|
|||
else
|
||||
ERROR_LOG_FILE="$(mktemp).err"
|
||||
echo # ensure newline
|
||||
timeout --kill-after=20 10 /usr/bin/mysqld_safe "${@:2}" --log-error="$ERROR_LOG_FILE"
|
||||
timeout --kill-after=20 10 /usr/bin/mariadbd-safe "${@:2}" --log-error="$ERROR_LOG_FILE"
|
||||
echo "Running '/etc/init.d/mariadb start' failed with error log:"
|
||||
cat "$ERROR_LOG_FILE"
|
||||
fi
|
||||
|
|
2
debian/tests/upstream
vendored
2
debian/tests/upstream
vendored
|
@ -68,7 +68,7 @@ eatmydata perl -I. ./mysql-test-run.pl \
|
|||
--parallel=auto --skip-rpl --suite=main \
|
||||
--skip-test-list="$MTR_SKIP_TEST_LIST" \
|
||||
--vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \
|
||||
--xml-report="$AUTOPKGTEST_ARTIFACTS/mysql-test-run-junit.xml" \
|
||||
--xml-report="$AUTOPKGTEST_ARTIFACTS/mariadb-test-run-junit.xml" \
|
||||
$MTR_ARGUMENTS_APPEND \
|
||||
"$@" 2>&1
|
||||
echo "run: OK"
|
||||
|
|
Loading…
Reference in a new issue