Commit 625c9582 authored by unknown's avatar unknown
Browse files

Make mysql_fix_privilege_tables.sh not dependent on the current directory. 


scripts/mysql_fix_privilege_tables.sh:
  Make the script not dependent on the current directory.
parent ef16a041

scripts/mysql_fix_privilege_tables.sh

+11 −2
Original line number Diff line number Diff line
@@ -97,9 +97,11 @@ fi 


# Find where 'mysql' command is located



dirname=`dirname "$0"`



if test -z "$bindir"

then

  for i in @bindir@ $basedir/bin client

  for i in @bindir@ $basedir/bin "$dirname/../client"

  do

    if test -f $i/mysql

    then
@@ -109,6 +111,13 @@ then 
  done

fi



if test -z "$bindir"

then

  echo "Could not find MySQL command-line client (mysql)."

  echo "Please use --basedir to specify the directory where MySQL is installed."

  exit 1

fi



cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host"

if test ! -z "$password" ; then

  cmd="$cmd --password=$password"
@@ -128,7 +137,7 @@ fi 


# Find where first mysql_fix_privilege_tables.sql is located

for i in $basedir/support-files $basedir/share $basedir/share/mysql \

        $basedir/scripts $pkgdatadir . ./scripts

        $basedir/scripts $pkgdatadir . "$dirname"

do

  if test -f $i/$file

  then