maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Rucha!

On Mar 21, Rucha Deodhar wrote:
> revision-id: d86fe72c027 (mariadb-10.5.2-386-gd86fe72c027)
> parent(s): de407e7cb4d
> author: Rucha Deodhar <rucha.deodhar@xxxxxxxxxxx>
> committer: Rucha Deodhar <rucha.deodhar@xxxxxxxxxxx>
> timestamp: 2021-03-18 00:58:43 +0530
> message:
> 
> MDEV-22010: use executables MariaDB named in scripts
> 
> As a part of this MDEV following changes were made:
> 1) Mariadb named executables used instead of mysql named executables in scripts
> 2) renamed mysql-test-run and mysql-stress-test to mariadb-test-run and
> mariadb-stress-test and created a symlink.
> 
> diff --git a/.gitignore b/.gitignore
> index d58dd2aa2b8..1a840d1a51d 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -600,3 +600,7 @@ tests/mariadb-client-test
>  versioninfo_dll.rc
>  versioninfo_exe.rc
>  win/packaging/ca/symlinks.cc
> +mysql-test/mysql-stress-test.pl
> +mysql-test/mysql-test-run
> +mysql-test/mysql-test-run.pl
> +mysql-test/mtr

Please, add these lines together with other mysql-test/ lines in the
file. Then you'll see that mysql-test-run and mtr are already ignored.

> diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
> index 5f183afe8fc..147bd7351bc 100644
> --- a/scripts/mysql_install_db.sh
> +++ b/scripts/mysql_install_db.sh
> @@ -338,11 +338,11 @@ then
>      cannot_find_file resolveip @resolveip_locations@
>      exit 1
>    fi
> -  mysqld=`find_in_dirs mysqld @mysqld_locations@`
> +  mysqld=`find_in_dirs mariadbd @mysqld_locations@`
>    if test -z "$mysqld"
>    then
> -    cannot_find_file mysqld @mysqld_locations@
> -    exit 1
> +      cannot_find_file mysqld @mysqld_locations@

you wanted to say "cannot_find_file mariadbd @mysqld_locations@"

> +      exit 1
>    fi
>    langdir=`find_in_dirs --dir errmsg.sys @errmsg_locations@`
>    if test -z "$langdir"
> @@ -579,7 +579,7 @@ else
>    echo
>    echo "    shell> $mysqld --skip-grant-tables --general-log &"
>    echo
> -  echo "and use the command line tool $bindir/mysql"
> +  echo "and use the command line tool $bindir/mariadb or $bindir/mysql"

I don't think you need any "or mysql" here.

>    echo "to connect to the mysql database and look at the grant tables:"
>    echo
>    echo "    shell> $bindir/mysql -u root mysql"
> @@ -613,7 +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/mariadb-admin' -u root password 'new-password' or"
> +    echo "'$bindir/mariadb-admin' -u root -h $hostname password 'new-password' or"

and not here.

>      echo "'$bindir/mysqladmin' -u root -h $hostname password 'new-password'"
>      echo
>      echo "Alternatively you can run:"
> diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh
> index b2a9edf4953..6098e0148b5 100644
> --- a/scripts/mysql_secure_installation.sh
> +++ b/scripts/mysql_secure_installation.sh
> @@ -159,15 +159,15 @@ then
>      cannot_find_file my_print_defaults $basedir/bin $basedir/extra
>      exit 1
>    fi
> -  mysql_command=`find_in_basedir mysql bin`
> +  mysql_command=`find_in_basedir mariadb bin`
>    if test -z "$mysql_command"
>    then
> -    cannot_find_file mysql $basedir/bin
> -    exit 1
> +      cannot_find_file mysql $basedir/bin

should be cannot_find_file mariadb $basedir/bin"

> +      exit 1
>    fi
>  else
>    print_defaults="@bindir@/my_print_defaults"
> -  mysql_command="@bindir@/mysql"
> +  mysql_command="@bindir@/mariadb"
>  fi
>  
>  if test ! -x "$print_defaults"
> diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
> index 0b33f61710e..d83663e03fc 100644
> --- a/scripts/mysqld_multi.sh
> +++ b/scripts/mysqld_multi.sh
> @@ -728,7 +728,7 @@ sub example
>  
>  [mysqld_multi]
>  mysqld     = @bindir@/mysqld_safe

mariadbd-safe ? (here and everywhere in this file)

Also, you've missed mysqld_safe in FIND_PROC set in
scripts/CMakeLists.txt

> -mysqladmin = @bindir@/mysqladmin
> +mysqladmin = @bindir@/mariadb-admin
>  user       = multi_admin
>  password   = my_password
>  
> diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
> index 126eb924814..7763fb9db91 100644
> --- a/scripts/mysqld_safe.sh
> +++ b/scripts/mysqld_safe.sh
> @@ -531,7 +531,11 @@ else
>    ledir='@libexecdir@'
>  fi
>  
> -helper=`find_in_bin mysqld_safe_helper`
> +helper=`find_in_bin mariadbd-safe-helper`
> +if test -x helper
> +then
> +   helper=`find_in_bin mysqld_safe_helper`
> +fi

no, remove the if, no need to fallback
(and you've got the condition wrong anyway)

>  print_defaults=`find_in_bin my_print_defaults`
>  # Check if helper exists
>  command -v $helper --help >/dev/null 2>&1
> diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
> index 5e134570881..b8621a76d6f 100644
> --- a/scripts/wsrep_sst_common.sh
> +++ b/scripts/wsrep_sst_common.sh
> @@ -273,16 +273,16 @@ SCRIPTS_DIR="$(cd $(dirname "$0"); pwd -P)"
>  EXTRA_DIR="$SCRIPTS_DIR/../extra"
>  CLIENT_DIR="$SCRIPTS_DIR/../client"
>  
> -if [ -x "$CLIENT_DIR/mysql" ]; then
> -    MYSQL_CLIENT="$CLIENT_DIR/mysql"
> +if [-x "$CLIENT_DIR/mariadb"]; then

"[" is a name of an executable, always leave a space after it.
there's no [-x executable.

> +    MYSQL_CLIENT="$CLIENT_DIR/mariadb"
>  else
> -    MYSQL_CLIENT=mysql
> +    MYSQL_CLIENT=mariadb
>  fi

Regards,
Sergei
VP of MariaDB Server Engineering
and security@xxxxxxxxxxx