From acfaa0458725708aa58970a34072d08c184d7856 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 14 Dec 2022 01:17:44 +1100
Subject: MDEV-18591: mysql_install_db - pass --log-error to mysqld in install
 (#2363)

Previously we parsed it out in mysql_install_db for use in the error
message, but failed to pass it to mysqld in the bootstrap.

Also match log_error as it might appear in the .cnf files.

Thanks Michal Schorm for the test case.

Reviewed by: Faustin Lammler
---
 scripts/mysql_install_db.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 4c6376142cc..67d9f683b35 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -148,7 +148,9 @@ parse_arguments()
       --builddir=*) builddir=`parse_arg "$arg"` ;;
       --srcdir=*)  srcdir=`parse_arg "$arg"` ;;
       --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;;
-      --log-error=*)
+      --log[-_]error=*)
+       # Keep in the arguments passed to the server
+       args="$args $arg"
        log_error=`parse_arg "$arg"` ;;
         # Note that the user will be passed to mysqld so that it runs
         # as 'user' (crucial e.g. if log-bin=/some_other_path/
-- 
cgit v1.2.1


From c4938eafc594d6d64e5a17be13c337ada0beb63d Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Fri, 16 Dec 2022 15:51:38 +0000
Subject: 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>
---
 scripts/galera_recovery.sh      | 2 +-
 scripts/mariadb-service-convert | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

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 "#"
-- 
cgit v1.2.1