wordpress-mysql will pass extra arguments to mysql client command line

1 files changed, 4 insertions, 25 deletions

diff --git a/wordpress/wordpress-mysql b/wordpress/wordpress-mysql
index cfd203c..9faf3c3 100755
--- a/wordpress/wordpress-mysql
+++ b/wordpress/wordpress-mysql
@@ -8,22 +8,12 @@ read_config()
 
 our_mysqladmin()
 {
-        if [ "$DO_NOT_USE_SSH" ]
-        then
-                mysqladmin "$@"
-        else
-                ssh -- "$db_host" mysqladmin "$@"
-        fi
+        ssh -- "$db_host" mysqladmin "$@"
 }
 
 our_mysql()
 {
-        if [ "$DO_NOT_USE_SSH" ]
-        then
-                mysql --host="$db_host" "$@"
-        else
-                ssh -- "$db_host" mysql "$@"
-        fi
+        ssh -- "$db_host" mysql "$@"
 }
 
 have_database()
@@ -49,10 +39,6 @@ do
                         shift
                         CREATE_NEW=y
                         ;;
-                --no-ssh)
-                        shift
-                        DO_NOT_USE_SSH=y
-                        ;;
                 --)     shift
                         break
                         ;;
@@ -65,19 +51,13 @@ do
 done
 
 read_config < <(wordpress-config-info "$1")
+shift
 
 [ "$db_name" ]
 [ "$db_host" ]
 [ "$db_user" ]
 [ "$db_password" ]
 
-DO_NOT_USE_SSH=
-if [ "$db_host" = localhost ]
-then
-        DO_NOT_USE_SSH=y
-fi
-DO_NOT_USE_SSH= # always use ssh
-
 if [ "$CREATE_NEW" ]
 then
         if ! have_database
@@ -89,6 +69,5 @@ then
         fi
         exit
 else
-        our_mysql --user="$db_user" --password="$db_password" "$db_name"
+        our_mysql --user="$db_user" --password="$db_password" "$@" "$db_name"
 fi
-