Commit 767d880f authored by unknown's avatar unknown
Browse files

mysql_priv.h: 

  Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)


VC++Files/sql/mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
client/mysqladmin.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlcheck.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqldump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlimport.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanager-pwgen.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanagerc.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlbinlog.cc:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlshow.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysqltest.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/my_print_defaults.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_install.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_waitpid.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/perror.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/resolve_stack_dump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
extra/resolveip.c:
  Added NULL error reporter parameter as the last paramter to handle_options
isam/isamchk.c:
  Added NULL error reporter parameter as the last paramter to handle_options
isam/pack_isam.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/mi_test1.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisam_ftdump.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisamchk.c:
  Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisampack.c:
  Added NULL error reporter parameter as the last paramter to handle_options
include/my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysys/my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
tools/mysqlmanager.c:
  Added NULL error reporter parameter as the last paramter to handle_options
client/mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
sql/mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
sql/log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
sql/gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
sql/mysql_priv.h:
  Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent 5ee446d9

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ ram@gw.mysql.r18.ru 
ram@mysql.r18.ru

ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

root@x3.internalnet

salle@geopard.(none)

salle@geopard.online.bg

VC++Files/sql/mysqld.dsp

+83 −0
Original line number Diff line number Diff line
@@ -900,6 +900,89 @@ SOURCE=.\log_event.cpp 
# End Source File

# Begin Source File



SOURCE=.\message.mc



!IF  "$(CFG)" == "mysqld - Win32 Release"



!ELSEIF  "$(CFG)" == "mysqld - Win32 Debug"



!ELSEIF  "$(CFG)" == "mysqld - Win32 nt"



# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 Max nt"

# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build

!ELSEIF  "$(CFG)" == "mysqld - Win32 Max"



!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"



!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"



!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"

# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build

!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"

# Begin Custom Build - Compiling messages

InputDir=.

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build

!ENDIF 



# End Source File

# Begin Source File



SOURCE=.\message.rc

# End Source File

# Begin Source File



SOURCE=.\mf_iocache.cpp



!IF  "$(CFG)" == "mysqld - Win32 Release"

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,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)))

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

    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)))

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

  {

    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)))

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

    exit(ho_error);



  return 0;