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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/galera_recovery.sh | 2 | ||||
| -rwxr-xr-x | scripts/mariadb-service-convert | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/galera_recovery.sh b/scripts/galera_recovery.sh index 8df2abc3fd5..9ff5e4e5f50 100644 --- a/scripts/galera_recovery.sh +++ b/scripts/galera_recovery.sh @@ -68,7 +68,7 @@ parse_arguments() { wsrep_recover_position() { # Redirect server's error log to the log file. - eval @sbindir@/mysqld $cmdline_args --user=$user --wsrep_recover \ + eval @sbindir@/mariadbd $cmdline_args --user=$user --wsrep_recover \ --disable-log-error 2> "$log_file" ret=$? if [ $ret -ne 0 ]; then diff --git a/scripts/mariadb-service-convert b/scripts/mariadb-service-convert index 38043733554..e43b9b926d5 100755 --- a/scripts/mariadb-service-convert +++ b/scripts/mariadb-service-convert @@ -25,7 +25,7 @@ tz_old=$TZ -. /usr/bin/mysqld_safe --dry-run +. /usr/bin/mariadbd-safe --dry-run echo "# converted using $0" echo "#" |