Commit c9394a0f authored by unknown's avatar unknown
Browse files

Added global my_getopt_error_reporter function pointer which is 

used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.


client/mysql.cc:
  Removed extra handle_optins()'s parameter.
client/mysqladmin.c:
  Removed extra handle_optins()'s parameter.
client/mysqlbinlog.cc:
  Removed extra handle_optins()'s parameter.
client/mysqlcheck.c:
  Removed extra handle_optins()'s parameter.
client/mysqldump.c:
  Removed extra handle_optins()'s parameter.
client/mysqlimport.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanager-pwgen.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanagerc.c:
  Removed extra handle_optins()'s parameter.
client/mysqlshow.c:
  Removed extra handle_optins()'s parameter.
client/mysqltest.c:
  Removed extra handle_optins()'s parameter.
extra/my_print_defaults.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_install.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_waitpid.c:
  Removed extra handle_optins()'s parameter.
extra/perror.c:
  Removed extra handle_optins()'s parameter.
extra/resolve_stack_dump.c:
  Removed extra handle_optins()'s parameter.
extra/resolveip.c:
  Removed extra handle_optins()'s parameter.
include/my_getopt.h:
  Removed extra handle_optins()'s parameter.
isam/isamchk.c:
  Removed extra handle_optins()'s parameter.
isam/pack_isam.c:
  Removed extra handle_optins()'s parameter.
myisam/mi_test1.c:
  Removed extra handle_optins()'s parameter.
myisam/myisam_ftdump.c:
  Removed extra handle_optins()'s parameter.
myisam/myisamchk.c:
  Removed extra handle_optins()'s parameter.
myisam/myisampack.c:
  Removed extra handle_optins()'s parameter.
sql/gen_lex_hash.cc:
  Removed extra handle_optins()'s parameter.
sql/mysqld.cc:
  Removed extra handle_optins()'s parameter.
tools/mysqlmanager.c:
  Removed extra handle_optins()'s parameter.
parent fb724e53

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static int get_options(int argc, char **argv) 
  opt_max_allowed_packet= *mysql_params->p_max_allowed_packet;

  opt_net_buffer_length= *mysql_params->p_net_buffer_length;



  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, 0)))

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

    exit(ho_error);



  *mysql_params->p_max_allowed_packet= opt_max_allowed_packet;

client/mysqladmin.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int main(int argc,char *argv[]) 
  mysql_init(&mysql);

  load_defaults("my",load_default_groups,&argc,&argv);

  save_argv = argv;				/* Save for free_defaults */

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, 0)))

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

  {

    free_defaults(save_argv);

    exit(ho_error);

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static int parse_args(int *argc, char*** argv) 


  result_file = stdout;

  load_defaults("my",load_default_groups,argc,argv);

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, NULL)))

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

    exit(ho_error);



  return 0;

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int get_options(int *argc, char ***argv) 


  load_defaults("my", load_default_groups, argc, argv);



  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, 0)))

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

    exit(ho_error);



  if (!what_to_do)

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static int get_options(int *argc, char ***argv) 
  md_result_file= stdout;

  load_defaults("my",load_default_groups,argc,argv);



  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, 0)))

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

    exit(ho_error);



  *mysql_params->p_max_allowed_packet= opt_max_allowed_packet;