Merge branch 'mysql-5.5' into mysql-5.6

Author: Shishir Jaiswal

client/mysqladmin.cc

@@ -334,8 +334,6 @@ int main(int argc,char *argv[])
     free_defaults(save_argv);
     exit(ho_error);
   }
-  temp_argv= mask_password(argc, &argv);
-  temp_argc= argc;
 
   if (debug_info_flag)
     my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;
@@ -347,6 +345,10 @@ int main(int argc,char *argv[])
     usage();
     exit(1);
   }
+
+  temp_argv= mask_password(argc, &argv);
+  temp_argc= argc;
+
   commands = temp_argv;
   if (tty_password)
     opt_password = get_tty_password(NullS);