[Commits] Rev 4482: MDEV-4399 mysql_secure_installation reports error in find_mysql_client in lp:~maria-captains/maria/10.0

Sergei Golubchik serg at mariadb.org
Thu Nov 13 17:29:20 EET 2014


At lp:~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4482
revision-id: sergii at pisem.net-20141113152917-kl9rd9r22t97qctq
parent: sergii at pisem.net-20141113151816-j1rumlc5wlhbb81c
fixes bug: https://mariadb.atlassian.net/browse/MDEV-4399
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 10.0
timestamp: Thu 2014-11-13 16:29:17 +0100
message:
  MDEV-4399 mysql_secure_installation reports error in find_mysql_client
  
  1. remove find_mysql_client (from a bad merge)
  2. use $mysql_command
=== modified file 'scripts/mysql_secure_installation.sh'
--- a/scripts/mysql_secure_installation.sh	2012-11-22 09:19:31 +0000
+++ b/scripts/mysql_secure_installation.sh	2014-11-13 15:29:17 +0000
@@ -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



More information about the commits mailing list