bzr commit into mysql-5.1 branch (jperkin:2708) Bug#41828

[Jonathan Perkin]

#At file:///home/sketch/bzr/mysql-5.1-build-bug41828/ based on
revid:jperkin@stripped

 2708 Jonathan Perkin	2009-01-06
      bug#41828: mysql_install_db misses mysqld options when using --basedir
      
       * some shell style fixes
modified:
  scripts/mysql_install_db.sh

=== modified file 'scripts/mysql_install_db.sh'

=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2009-01-05 13:14:48 +0000
+++ b/scripts/mysql_install_db.sh	2009-01-06 11:33:06 +0000
@@ -107,7 +107,7 @@
         # Note that the user will be passed to mysqld so that it runs
         # as 'user' (crucial e.g. if log-bin=/some_other_path/
         # where a chown of datadir won't help)
-	 user=`parse_arg "$arg"` ;;
+        user=`parse_arg "$arg"` ;;
       --skip-name-resolve) ip_only=1 ;;
       --verbose) verbose=1 ;; # Obsolete
       --rpm) in_rpm=1 ;;
@@ -182,7 +182,7 @@
     echo
     for dir in "$@"
     do
-      echo "    ${dir}"
+      echo "    $dir"
     done
   fi
 
@@ -224,7 +224,7 @@
 elif test -n "$basedir"
 then
   print_defaults=`find_in_basedir my_print_defaults bin extra`
-  if test -z "${print_defaults}"
+  if test -z "$print_defaults"
   then
     cannot_find_file my_print_defaults $basedir/bin $basedir/extra
     exit 1
@@ -259,19 +259,19 @@
   bindir="$basedir/bin"
   extra_bindir="$bindir"
   mysqld=`find_in_basedir mysqld libexec sbin bin`
-  if test -z "${mysqld}"
+  if test -z "$mysqld"
   then
     cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
     exit 1
   fi
   langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
-  if test -z "${langdir}"
+  if test -z "$langdir"
   then
     cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
     exit 1
   fi
   pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
-  if test -z "${pkgdatadir}"
+  if test -z "$pkgdatadir"
   then
     cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
     exit 1