From 626e2aeb1657f112feb6d03c34bb9e9f44764c75 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Thu, 23 Mar 2000 04:19:26 +0000 Subject: zsh-workers/10195 --- Completion/User/_mysql_utils | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'Completion/User/_mysql_utils') diff --git a/Completion/User/_mysql_utils b/Completion/User/_mysql_utils index 6d777112d..77ed7a36e 100644 --- a/Completion/User/_mysql_utils +++ b/Completion/User/_mysql_utils @@ -24,33 +24,33 @@ _mysql_hosts () { local _mysql_user _mysql_port _mysql_host _mysql_params _mysql_get_identity - _wanted hosts expl 'server host' && + _wanted hosts expl 'server host' \ _combination -s '[:@]' '' hosts-ports-users \ ${_mysql_user:+users=${_mysql_user:q}} \ ${_mysql_port:+ports=${_mysql_port:q}} \ - hosts "$expl[@]" + hosts - } _mysql_ports () { local _mysql_user _mysql_port _mysql_host _mysql_params _mysql_get_identity - _wanted ports expl 'server port' && + _wanted ports expl 'server port' \ _combination -s '[:@]' '' hosts-ports-users \ ${_mysql_user:+users=${_mysql_user:q}} \ ${_mysql_host:+hosts=${_mysql_host:q}} \ - ports "$expl[@]" + ports - } _mysql_users () { local _mysql_user _mysql_port _mysql_host _mysql_params _mysql_get_identity - _wanted users expl 'server username' && + _wanted users expl 'server username' \ _combination -s '[:@]' '' hosts-ports-users \ ${_mysql_host:+hosts=${_mysql_host:q}} \ ${_mysql_port:+ports=${_mysql_port:q}} \ - users "$expl[@]" + users - } _mysql_databases () { @@ -205,15 +205,13 @@ _mysqladmin_commands () { ) if (( CURRENT == 1 )); then - _tags commands && compadd "$@" $cmds + _wanted commands expl command compadd "$@" - $cmds else local curcontext="$curcontext" case "$words[1]" in - (create) - ;& - (drop) - _wanted mysqldbs expl "MySQL databases" && _mysql_databases + (create|drop) + _wanted mysqldbs expl "MySQL databases" _mysql_databases ;; (kill) _message 'thread ids' -- cgit 1.4.1