diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 22:26:04 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 22:26:04 +0100 |
| commit | a0a93d99939de297863f7060e78e6a0ce7a271a7 (patch) | |
| tree | 4cf446426ba2ea3f0380d85e4b6bec99a112c972 /scripts/mysql_secure_installation.sh | |
| parent | 2d25525d37b4bb55d065226c636453c195fd6f7d (diff) | |
| download | mariadb-git-a0a93d99939de297863f7060e78e6a0ce7a271a7.tar.gz | |
MDEV-4399 mysql_secure_installation reports error in find_mysql_client
1. remove find_mysql_client (from a bad merge)
2. use $mysql_command
Diffstat (limited to 'scripts/mysql_secure_installation.sh')
| -rw-r--r-- | scripts/mysql_secure_installation.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index 9e9bce9fa87..8eca327028e 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -182,7 +182,7 @@ else fi mysql_command=`find_in_basedir mysql $bindir` -if test -z "$print_defaults" +if test -z "$mysql_command" then cannot_find_file mysql $bindir exit 1 @@ -204,7 +204,7 @@ prepare() { do_query() { echo "$1" >$command #sed 's,^,> ,' < $command # Debugging - $bindir/mysql --defaults-file=$config <$command + $mysql_command --defaults-file=$config <$command return $? } @@ -376,7 +376,6 @@ clean_and_exit() { # The actual script starts here prepare -find_mysql_client set_echo_compat echo |