Commit 266ca421 authored by Georgi Kodinov's avatar Georgi Kodinov

Bug #52274 : Missing path to mysql in mysql_secure_installation

      
Added some code to try to find the mysql command line in the most 
common places and stop if it's not there.
parent f801ca68
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
config=".my.cnf.$$" config=".my.cnf.$$"
command=".mysql.$$" command=".mysql.$$"
mysql_client=""
trap "interrupt" 2 trap "interrupt" 2
...@@ -37,10 +38,26 @@ prepare() { ...@@ -37,10 +38,26 @@ prepare() {
chmod 600 $config $command chmod 600 $config $command
} }
find_mysql_client()
{
for n in ./bin/mysql mysql
do
$n --no-defaults --help > /dev/null 2>&1
status=$?
if test $status -eq 0
then
mysql_client=$n
return
fi
done
echo "Can't find a 'mysql' client in PATH or ./bin"
exit 1
}
do_query() { do_query() {
echo "$1" >$command echo "$1" >$command
#sed 's,^,> ,' < $command # Debugging #sed 's,^,> ,' < $command # Debugging
mysql --defaults-file=$config <$command $mysql_client --defaults-file=$config <$command
return $? return $?
} }
...@@ -204,6 +221,7 @@ cleanup() { ...@@ -204,6 +221,7 @@ cleanup() {
# The actual script starts here # The actual script starts here
prepare prepare
find_mysql_client
set_echo_compat set_echo_compat
echo echo
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment