Hi, Rucha! It's ok to push, with a couple of changes, see below
On May 11, Rucha Deodhar wrote: > revision-id: 58df9e3446b (mariadb-10.5.2-386-g58df9e3446b) > parent(s): de407e7cb4d > author: Rucha Deodhar <rucha.deod...@mariadb.com> > committer: Rucha Deodhar <rucha.deod...@mariadb.com> > timestamp: 2021-04-06 16:40:42 +0530 > message: > > MDEV-22010: use executables MariaDB named in scripts > diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt > index 8d6a486a29d..6f3393a9c22 100644 > --- a/scripts/CMakeLists.txt > +++ b/scripts/CMakeLists.txt > @@ -142,11 +142,11 @@ IF(UNIX) > # FIND_PROC and CHECK_PID are used by mysqld_safe > IF(CMAKE_SYSTEM_NAME MATCHES "Linux") > SET (FIND_PROC > - "ps wwwp $PID | grep -v mysqld_safe | grep -- $MYSQLD > /dev/null") > + "ps wwwp $PID | grep -v mariadbd-safe | grep -- $MYSQLD > /dev/null") I think you need to filter out both mysqld_safe and mariadbd-safe here. because the user can start this script under either name, you need to ignore both. Like grep -v '\(mysqld_safe\|mariadbd-safe\)' > ENDIF() > IF(NOT FIND_PROC AND CMAKE_SYSTEM_NAME MATCHES "SunOS") > SET (FIND_PROC > - "ps -p $PID | grep -v mysqld_safe | grep -- $MYSQLD > /dev/null") > + "ps -p $PID | grep -v mariadbd-safe | grep -- $MYSQLD > /dev/null") > ENDIF() > > IF(NOT FIND_PROC) > diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh > index 5f183afe8fc..05ce4f31a69 100644 > --- a/scripts/mysql_install_db.sh > +++ b/scripts/mysql_install_db.sh > @@ -613,8 +613,8 @@ then > echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !" > echo "To do so, start the server, then issue the following commands:" > echo > - echo "'$bindir/mysqladmin' -u root password 'new-password'" > - echo "'$bindir/mysqladmin' -u root -h $hostname password 'new-password'" > + echo "'$bindir/mariadb-admin' -u root password 'new-password'" > + echo "'$bindir/mariadb-admin' -u root -h $hostname password > 'new-password'" > echo > echo "Alternatively you can run:" > echo "'$bindir/mysql_secure_installation'" ^^^ mariadb-secure-installation Regards, Sergei VP of MariaDB Server Engineering and secur...@mariadb.org _______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp