mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

WL#3298: IM: make command-line option names consistent

Browse source 
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.


mysql-test/t/im_cmd_line.imtest:
  Renamed "--passwd" to "--print-password-line".
server-tools/instance-manager/options.cc:
  1. Removed '-P' option;
  2. Renamed '--passwd' to '--print-password-line'.
server-tools/instance-manager/user_management_commands.cc:
  Renamed class Passwd_cmd to Print_password_line_cmd.
server-tools/instance-manager/user_management_commands.h:
  Renamed class Passwd_cmd to Print_password_line_cmd.
This commit is contained in:
unknown 2006-06-19 14:41:29 +04:00
commit 5754a76bbf
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server-tools/instance-manager/options.cc
View file

@ -114,7 +114,6 @@ static const int ANGEL_PID_FILE_SUFFIX_LEN= strlen(ANGEL_PID_FILE_SUFFIX);
*/
enum options {
OPT_PASSWD= 'P',
OPT_USERNAME= 'u',
OPT_PASSWORD= 'p',
OPT_LOG= 256,
@ -135,6 +134,7 @@ enum options {
OPT_PORT,
OPT_WAIT_TIMEOUT,
OPT_BIND_ADDRESS,
OPT_PRINT_PASSWORD_LINE,
OPT_ADD_USER,
OPT_DROP_USER,
OPT_EDIT_USER,
@ -225,8 +225,8 @@ static struct my_option my_long_options[] =
(gptr *) &Options::Main::mysqld_safe_compatible,
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
{ "passwd", OPT_PASSWD,
"Prepare an entry for the password file and exit.",
{ "print-password-line", OPT_PRINT_PASSWORD_LINE,
"Print out a user entry as a line for the password file and exit.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "password", OPT_PASSWORD, "Password to update the password file",
@ -339,7 +339,7 @@ get_one_option(int optid,
case 'V':
version();
exit(0);
case OPT_PASSWD:
case OPT_PRINT_PASSWORD_LINE:
case OPT_ADD_USER:
case OPT_DROP_USER:
case OPT_EDIT_USER:
@ -354,8 +354,8 @@ get_one_option(int optid,
}
switch (optid) {
case OPT_PASSWD:
Options::User_management::cmd= new Passwd_cmd();
case OPT_PRINT_PASSWORD_LINE:
Options::User_management::cmd= new Print_password_line_cmd();
break;
case OPT_ADD_USER:
Options::User_management::cmd= new Add_user_cmd();