From 9935110b30fff7fb79bf3eebdfd310b86474d425 Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Fri, 19 Mar 2004 14:52:48 +0200
Subject: Portability fixes Removed \r from new tests Fixes to get new
 sustem_mysql_db... tests to work

client/mysqltest.c:
  More debug information
innobase/que/que0que.c:
  Fixed wrong usage of __attribute
mysql-test/mysql-test-run.sh:
  Portability fix; Added CLIENT_BINDIR
mysql-test/t/system_mysql_db_fix.test:
  Removed \r
mysql-test/t/system_mysql_db_refs.test:
  Removed \r
scripts/mysql_fix_privilege_tables.sh:
  Don't set root password from first option
  Added --bindir option
---
 scripts/mysql_fix_privilege_tables.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'scripts/mysql_fix_privilege_tables.sh')

diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index 5e3e4210aa4..1dac3ebc725 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -32,13 +32,23 @@
 #   --password=<password>
 #   --database=<database>
 
-root_password="$1"
+root_password=""
 host="localhost"
 user="root"
 port=""
 socket=""
 comment=""
 database="mysql"
+bindir="@bindir@"
+
+# Old format where there is only one argument and it's the password
+if test "$#" == 1
+then
+  case "$1" in
+  --*) ;;
+  *) root_password="$1" ; shift ;;
+  esac
+fi
 
 # read all the options
 parse_arguments() 
@@ -52,6 +62,7 @@ parse_arguments()
       --socket=*) socket=`echo "$arg" | sed -e "s;--socket=;;"` ;;
       --password=*) root_password=`echo "$arg" | sed -e "s;--password=;;"` ;;
       --database=*) database=`echo "$arg" | sed -e "s;--database=;;"` ;;
+      --bindir=*) bindir=`echo "$arg" | sed -e "s;--bindir=;;"` ;;
       *)
         echo "Unknown argument '$arg'"
         exit 1
@@ -63,7 +74,7 @@ parse_arguments()
 parse_arguments "$@"
 
 if test -z "$cmd"; then
-  cmd="@bindir@/mysql -f --user=$user --host=$host"
+  cmd="$bindir/mysql -f --user=$user --host=$host"
   if test ! -z "$root_password"; then
     cmd="$cmd --password=$root_password"
   fi
-- 
cgit v1.2.1