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.
This commit is contained in:
parent
f801ca68c6
commit
266ca421da
@ -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() {
|
|||||||
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() {
|
|||||||
# The actual script starts here
|
# The actual script starts here
|
||||||
|
|
||||||
prepare
|
prepare
|
||||||
|
find_mysql_client
|
||||||
set_echo_compat
|
set_echo_compat
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
Loading…
x
Reference in New Issue
Block a user