1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-4399 mysql_secure_installation reports error in find_mysql_client

Browse Source 
1. remove find_mysql_client (from a bad merge)
2. use $mysql_command
This commit is contained in:
Sergei Golubchik 2014-11-18 22:26:04 +01:00
parent 2d25525d37
commit a0a93d9993
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/mysql_secure_installation.sh
View File

@ -182,7 +182,7 @@ else
fi fi
mysql_command=`find_in_basedir mysql $bindir` mysql_command=`find_in_basedir mysql $bindir`
if test -z "$print_defaults" if test -z "$mysql_command"
then then
cannot_find_file mysql $bindir cannot_find_file mysql $bindir
exit 1 exit 1
@ -204,7 +204,7 @@ prepare() {
do_query() { do_query() {
echo "$1" >$command echo "$1" >$command
#sed 's,^,> ,' < $command # Debugging #sed 's,^,> ,' < $command # Debugging
$bindir/mysql --defaults-file=$config <$command $mysql_command --defaults-file=$config <$command
return $? return $?
} }
@ -376,7 +376,6 @@ clean_and_exit() {
# The actual script starts here # The actual script starts here
prepare prepare
find_mysql_client
set_echo_compat set_echo_compat
echo echo