mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-33750: Brand some mysql stuff to mariadb

Browse source 
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:
Tuukka Pasanen 2024-06-14 10:11:18 +03:00 committed by Daniel Black
parent c22d01c91d
commit d94f34c1ed
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/mariadb-server.mariadb.init vendored
View file

@ -10,7 +10,7 @@
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Start and stop the MariaDB database server daemon # Short-Description: Start and stop the MariaDB database server daemon
# Description: Controls the main MariaDB database server daemon "mariadbd" # Description: Controls the main MariaDB database server daemon "mariadbd"
# and its wrapper script "mysqld_safe". # and its wrapper script "mariadbd-safe".
### END INIT INFO ### END INIT INFO
# #
set -e set -e
@ -216,7 +216,7 @@ case "${1:-''}" in
else else
ERROR_LOG_FILE="$(mktemp).err" ERROR_LOG_FILE="$(mktemp).err"
echo # ensure newline 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:" echo "Running '/etc/init.d/mariadb start' failed with error log:"
cat "$ERROR_LOG_FILE" cat "$ERROR_LOG_FILE"
fi fi

2
debian/tests/upstream vendored
View file

@ -68,7 +68,7 @@ eatmydata perl -I. ./mysql-test-run.pl \
--parallel=auto --skip-rpl --suite=main \ --parallel=auto --skip-rpl --suite=main \
--skip-test-list="$MTR_SKIP_TEST_LIST" \ --skip-test-list="$MTR_SKIP_TEST_LIST" \
--vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \ --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 \ $MTR_ARGUMENTS_APPEND \
"$@" 2>&1 "$@" 2>&1
echo "run: OK" echo "run: OK"