database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Portability fixes

Browse Source 
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
This commit is contained in:
monty@mysql.com
2004-03-19 14:52:48 +02:00
parent b4364ca7a6
commit b7fc7188d0
6 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/mysql_fix_privilege_tables.sh
View File

@ -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