diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2003-05-12 03:39:26 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2003-05-12 03:39:26 +0000 |
| commit | 8250f5cdd283bc3cc23198245ce8906d131db5b2 (patch) | |
| tree | 4ca65a1215ea457459f19ccc3d129e5d5cca6660 /localaddmysqldb | |
| parent | 310583c61dcad3fc39586537658124cf48977bb5 (diff) | |
Allow mysql to fail, and use mysql instead of mysqladmin.
Diffstat (limited to 'localaddmysqldb')
| -rwxr-xr-x | localaddmysqldb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/localaddmysqldb b/localaddmysqldb index 5167f90..71a566c 100755 --- a/localaddmysqldb +++ b/localaddmysqldb @@ -3,7 +3,7 @@ # /usr/local/sbin/localaddmysqldb # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: localaddmysqldb,v 1.1 2003-05-12 03:28:31 jonas Exp $ +# $Id: localaddmysqldb,v 1.2 2003-05-12 03:40:20 jonas Exp $ # # Add/update MySQL database # @@ -183,7 +183,7 @@ if [ -z "$dbadmpass" ]; then exit 1 fi fi -alldb=`mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "show databases;" | grep -v '^Database$'` +alldb=`mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "show databases;" | grep -v '^Database$'` ############################################## # The rest of the script is dbname-specific... # @@ -225,7 +225,7 @@ if [ -n "$error" ]; then exit 1 fi else - mysqladmin -u$dbadmin -p$dbadmpass $optdbserver -f drop $dbname + mysql -u$dbadmin -p$dbadmpass $optdbserver -f -e "DROP DATABASE $dbname;" fi else echo "ERROR: $error!" @@ -247,7 +247,7 @@ if [ -e /usr/share/wwwconfig-common/mysql-createdb.sh ] ; then fi else # TODO: Purge existing database as the wwwconfig-common script does - mysqladmin -u$dbadmin -p$dbadmpass $optdbserver create $dbname + mysql -u$dbadmin -p$dbadmpass $optdbserver -e "CREATE DATABASE $dbname;" fi if [ -n "$verbose" ]; then @@ -261,18 +261,18 @@ if [ -e /usr/share/wwwconfig-common/mysql-createuser.sh ] ; then exit 1 fi for h in `echo "localhost $dballow" | sort -u`; do -# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';" - mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "REVOKE DELETE,CREATE,DROP ON $dbname.* FROM '$dbuser'@'$h';" +# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';" + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "REVOKE DELETE,CREATE,DROP ON $dbname.* FROM '$dbuser'@'$h';" done else for h in `echo "localhost $dballow" | sort -u`; do -# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" - mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT SELECT,INSERT,UPDATE ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" +# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" done fi for h in `echo "localhost $dballow" | sort -u`; do - mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser-admin'@'$h' IDENTIFIED BY '$dbpass';" + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser-admin'@'$h' IDENTIFIED BY '$dbpass';" done done |