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)
parent f78ec279
......@@ -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
......
......@@ -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"
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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)))
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, 0)))
exit(ho_error);
if (!what_to_do)
......
......@@ -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)))
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;
......
......@@ -206,7 +206,7 @@ static int get_options(int *argc, char ***argv)
{
int ho_error;
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);
if (enclosed && opt_enclosed)
......
......@@ -95,7 +95,7 @@ int parse_args(int argc, char** argv)
{
int ho_error;
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;
......
......@@ -133,7 +133,7 @@ int parse_args(int argc, char **argv)
load_defaults("my",load_default_groups,&argc,&argv);
default_argv= 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;
......
......@@ -261,7 +261,7 @@ get_options(int *argc,char ***argv)
{
int ho_error;
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);
if (tty_password)
......
......@@ -2062,7 +2062,7 @@ int parse_args(int argc, char **argv)
load_defaults("my",load_default_groups,&argc,&argv);
default_argv= argv;
if ((handle_options(&argc, &argv, my_long_options, get_one_option)))
if ((handle_options(&argc, &argv, my_long_options, get_one_option, 0)))
exit(1);
if (argc > 1)
......
......@@ -100,7 +100,7 @@ static int get_options(int *argc,char ***argv)
{
int ho_error;
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);
if (*argc < 1)
......
......@@ -218,7 +218,7 @@ static int parse_args(int argc, char **argv)
{
int ho_error;
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;
......
......@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
progname= argv[0];
if (handle_options(&argc, &argv, my_long_options, get_one_option))
if (handle_options(&argc, &argv, my_long_options, get_one_option, NULL))
exit(-1);
if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 ||
(t= atoi(argv[1])) <= 0)
......
......@@ -145,7 +145,7 @@ static int get_options(int *argc,char ***argv)
{
int ho_error;
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);
if (!*argc && !print_all_codes)
......
......@@ -121,7 +121,7 @@ static int parse_args(int argc, char **argv)
{
int ho_error;
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);
/*
......
......@@ -90,7 +90,7 @@ static int get_options(int *argc,char ***argv)
{
int ho_error;
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);
if (*argc == 0)
......
......@@ -50,11 +50,11 @@ struct my_option
extern char *disabled_my_option;
extern my_bool my_getopt_print_errors;
typedef my_bool (* hoGetOneOption) (int, const struct my_option *, char * );
typedef void (* hoErrorReporter) (const char *format, va_list args );
extern int handle_options (int *argc, char ***argv,
const struct my_option *longopts,
my_bool (*get_one_option)(int,
const struct my_option *,
char *));
const struct my_option *longopts, hoGetOneOption, hoErrorReporter );
extern void my_print_help(const struct my_option *options);
extern void my_print_variables(const struct my_option *options);
......
......@@ -670,7 +670,7 @@ static void get_options(register int *argc, register char ***argv)
if (isatty(fileno(stdout)))
testflag|=T_WRITE_LOOP;
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);
if (*argc == 0)
......
......@@ -353,7 +353,7 @@ static void get_options(int *argc, char ***argv)
{
int ho_error;
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);
my_progname= argv[0][0];
......
......@@ -643,7 +643,7 @@ static void get_options(int argc, char *argv[])
{
int ho_error;
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;
......
......@@ -66,7 +66,7 @@ int main(int argc,char *argv[])
struct { MI_INFO *info; } aio0, *aio=&aio0; /* for GWS_IN_USE */
MY_INIT(argv[0]);
if (error=handle_options(&argc, &argv, my_long_options, get_one_option))
if (error=handle_options(&argc, &argv, my_long_options, get_one_option, NULL))
exit(error);
if (count || dump)
verbose=0;
......
......@@ -677,7 +677,7 @@ static void get_options(register int *argc,register char ***argv)
if (isatty(fileno(stdout)))
check_param.testflag|=T_WRITE_LOOP;
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);
/* If using repair, then update checksum if one uses --update-state */
......
......@@ -350,7 +350,7 @@ static void get_options(int *argc,char ***argv)
if (isatty(fileno(stdout)))
write_loop=1;
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);
if (!*argc)
......
......@@ -56,6 +56,19 @@ char *disabled_my_option= (char*) "0";
my_bool my_getopt_print_errors= 1;
void report_option_error( hoErrorReporter reporter, const char *format, ... )
{
va_list args;
va_start( args, format );
if (reporter != NULL)
reporter( format, args );
else
vfprintf( stderr, format, args );
va_end( args );
}
/*
function: handle_options
......@@ -68,10 +81,7 @@ my_bool my_getopt_print_errors= 1;
*/
int handle_options(int *argc, char ***argv,
const struct my_option *longopts,
my_bool (*get_one_option)(int,
const struct my_option *,
char *))
const struct my_option *longopts, hoGetOneOption get_one_option, hoErrorReporter reporter )
{
uint opt_found, argvpos= 0, length, i;
my_bool end_of_options= 0, must_be_var, set_maximum_value, special_used,
......@@ -109,7 +119,7 @@ int handle_options(int *argc, char ***argv,
if (!*++pos)
{
if (my_getopt_print_errors)
fprintf(stderr, "%s: Option '-O' requires an argument\n",
report_option_error(reporter, "%s: Option '-O' requires an argument\n",
progname);
return EXIT_ARGUMENT_REQUIRED;
}
......@@ -126,7 +136,7 @@ int handle_options(int *argc, char ***argv,
if (!*cur_arg)
{
if (my_getopt_print_errors)
fprintf(stderr,
report_option_error(reporter,
"%s: Option '--set-variable' requires an argument\n",
progname);
return EXIT_ARGUMENT_REQUIRED;
......@@ -140,7 +150,7 @@ int handle_options(int *argc, char ***argv,
if (!*++pos)
{
if (my_getopt_print_errors)
fprintf(stderr,
report_option_error( reporter,
"%s: Option '--set-variable' requires an argument\n",
progname);
return EXIT_ARGUMENT_REQUIRED;
......@@ -201,7 +211,7 @@ int handle_options(int *argc, char ***argv,
if (opt_found > 1)
{
if (my_getopt_print_errors)
fprintf(stderr,
report_option_error( reporter,
"%s: ambiguous option '--%s-%s' (--%s-%s)\n",
progname, special_opt_prefix[i], cur_arg,
special_opt_prefix[i], prev_found);
......@@ -236,7 +246,7 @@ int handle_options(int *argc, char ***argv,
if (must_be_var)
{
if (my_getopt_print_errors)
fprintf(stderr,
report_option_error( reporter,
"%s: %s: unknown variable '%s'\n", progname,
option_is_loose ? "WARNING" : "ERROR", cur_arg);
if (!option_is_loose)
......@@ -245,7 +255,7 @@ int handle_options(int *argc, char ***argv,
else
{
if (my_getopt_print_errors)
fprintf(stderr,
report_option_error( reporter,
"%s: %s: unknown option '--%s'\n", progname,
option_is_loose ? "WARNING" : "ERROR", cur_arg);
if (!option_is_loose)
......@@ -263,14 +273,14 @@ int handle_options(int *argc, char ***argv,
if (must_be_var)
{
if (my_getopt_print_errors)
fprintf(stderr, "%s: variable prefix '%s' is not unique\n",
report_option_error( reporter, "%s: variable prefix '%s' is not unique\n",
progname, cur_arg);
return EXIT_VAR_PREFIX_NOT_UNIQUE;
}
else
{
if (my_getopt_print_errors)
fprintf(stderr, "%s: ambiguous option '--%s' (%s, %s)\n",
report_option_error( reporter, "%s: ambiguous option '--%s' (%s, %s)\n",
progname, cur_arg, prev_found, optp->name);
return EXIT_AMBIGUOUS_OPTION;
}
......@@ -278,7 +288,7 @@ int handle_options(int *argc, char ***argv,
if (must_be_var && optp->var_type == GET_NO_ARG)
{
if (my_getopt_print_errors)
fprintf(stderr, "%s: option '%s' cannot take an argument\n",
report_option_error( reporter, "%s: option '%s' cannot take an argument\n",
progname, optp->name);
return EXIT_NO_ARGUMENT_ALLOWED;
}
......@@ -287,7 +297,7 @@ int handle_options(int *argc, char ***argv,
if (optend && optp->var_type != GET_BOOL)
{
if (my_getopt_print_errors)
fprintf(stderr, "%s: option '--%s' cannot take an argument\n",
report_option_error( reporter, "%s: option '--%s' cannot take an argument\n",
progname, optp->name);
return EXIT_NO_ARGUMENT_ALLOWED;
}
......@@ -325,7 +335,7 @@ int handle_options(int *argc, char ***argv,
if (!*++pos)
{
if (my_getopt_print_errors)
fprintf(stderr, "%s: option '--%s' requires an argument\n",
report_option_error( reporter, "%s: option '--%s' requires an argument\n",
progname, optp->name);
return EXIT_ARGUMENT_REQUIRED;
}
......@@ -375,7 +385,7 @@ int handle_options(int *argc, char ***argv,
if (!pos[1])
{
if (my_getopt_print_errors)
fprintf(stderr,
report_option_error( reporter,
"%s: option '-%c' requires an argument\n",
progname, optp->id);
return EXIT_ARGUMENT_REQUIRED;
......@@ -387,7 +397,7 @@ int handle_options(int *argc, char ***argv,
}
if ((error= setval(optp, argument, set_maximum_value)))
{
fprintf(stderr,
report_option_error( reporter,
"%s: Error while setting value '%s' to '%s'\n",
progname, argument, optp->name);
return error;
......@@ -399,7 +409,7 @@ int handle_options(int *argc, char ***argv,
if (!opt_found)
{
if (my_getopt_print_errors)
fprintf(stderr,
report_option_error( reporter,
"%s: unknown option '-%c'\n", progname, *optend);
return EXIT_UNKNOWN_OPTION;
}
......@@ -409,7 +419,7 @@ int handle_options(int *argc, char ***argv,
}
if ((error= setval(optp, argument, set_maximum_value)))
{
fprintf(stderr,
report_option_error( reporter,
"%s: Error while setting value '%s' to '%s'\n",
progname, argument, optp->name);
return error;
......
......@@ -384,7 +384,7 @@ static int get_options(int argc, char **argv)
{
int ho_error;
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);
if (argc >= 1)
......
......@@ -31,12 +31,51 @@
#include <m_ctype.h> // For test_if_number
#include <assert.h>
#ifdef __NT__
#include "message.h"
#endif
MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log;
extern I_List<i_string> binlog_do_db, binlog_ignore_db;
static bool test_if_number(const char *str,
long *res, bool allow_wildcards);
#ifdef __NT__
static int eventSource = 0;
void setupWindowsEventSource()
{
if (eventSource) return;
eventSource = 1;
HKEY hRegKey = NULL;
DWORD dwError = 0;
TCHAR szPath[ MAX_PATH ];
// Create the event source registry key
dwError = RegCreateKey( HKEY_LOCAL_MACHINE,
"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\MySQL",
&hRegKey );
// Name of the PE module that contains the message resource
GetModuleFileName( NULL, szPath, MAX_PATH );
// Register EventMessageFile
dwError = RegSetValueEx( hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
(PBYTE) szPath, strlen(szPath)+1 );
// Register supported event types
DWORD dwTypes = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
dwError = RegSetValueEx( hRegKey, "TypesSupported", 0, REG_DWORD,
(LPBYTE) &dwTypes, sizeof dwTypes );
RegCloseKey( hRegKey );
}
#endif
/****************************************************************************
** Find a uniq filename for 'filename.#'.
** Set # to a number as low as possible
......@@ -1677,41 +1716,42 @@ static bool test_if_number(register const char *str,
} /* test_if_number */
void sql_print_error(const char *format,...)
void print_buffer_to_log( my_bool timestamp, const char *buffer )
{
va_list args;
time_t skr;
struct tm tm_tmp;
struct tm *start;
va_start(args,format);
DBUG_ENTER("sql_print_error");
DBUG_ENTER("sql_print_buffer_to_log");
#if !defined(__WIN__) && !defined(__NT__)
VOID(pthread_mutex_lock(&LOCK_error_log));
#ifndef DBUG_OFF
{
char buff[1024];
my_vsnprintf(buff,sizeof(buff)-1,format,args);
DBUG_PRINT("error",("%s",buff));
va_end(args);
va_start(args,format);
}
#endif
skr=time(NULL);
localtime_r(&skr,&tm_tmp);
start=&tm_tmp;
fprintf(stderr,"%02d%02d%02d %2d:%02d:%02d ",
start->tm_year % 100,
start->tm_mon+1,
if (timestamp)
{
skr=time(NULL);
localtime_r(&skr, &tm_tmp);
start=&tm_tmp;
fprintf( stderr, "%02d%02d%02d %2d:%02d:%02d %s",
start->tm_year % 100,
start->tm_mon+1,
start->tm_mday,
start->tm_hour,
start->tm_min,
start->tm_sec);
(void) vfprintf(stderr,format,args);
(void) fputc('\n',stderr);
start->tm_sec,
buffer );
}
else
fprintf( stderr, "%s", buffer );
fputc('\n', stderr);
fflush(stderr);
va_end(args);
#if !defined(__WIN__) && !defined(__NT__)
VOID(pthread_mutex_unlock(&LOCK_error_log));
#endif
DBUG_VOID_RETURN;
}
......@@ -1770,3 +1810,125 @@ bool flush_error_log()
}
return result;
}
/**
* prints a printf style message to the error log and, under NT, to the Windows event log.
* @param event_type type of even to log.
* @param timestamp true to add a timestamp to the entry, false otherwise.
* @param format The printf style format of the message
* @param ... values for the message
* @return void
*/
void print_msg_to_log( long event_type, my_bool timestamp, const char *format, ... )
{
va_list args;
DBUG_ENTER("startup_print_msg_to_logo");
va_start( args, format );
vprint_msg_to_log( event_type, timestamp, format, args );
va_end( args );
DBUG_VOID_RETURN;
}
/**
* prints a printf style message to the error log and, under NT, to the Windows event log.
* @param event_type type of even to log.
* @param timestamp true to add a timestamp to the entry, false otherwise.
* @param format The printf style format of the message
* @param args va_list prepped arument list
* @return void
*/
void vprint_msg_to_log(long event_type, my_bool timestamp, const char *format, va_list args)
{
char buff[1024];
DBUG_ENTER("startup_vprint_msg_to_log");
my_vsnprintf( buff, sizeof(buff)-5, format, args );
print_buffer_to_log( timestamp, buff );
#ifndef DBUG_OFF
DBUG_PRINT("error",("%s",buff));
#endif
#ifdef __NT__
HANDLE event;
LPSTR buffptr;
strcat( buff, "\r\n\r\n" );
buffptr = (LPSTR)&buff;
setupWindowsEventSource();
if (event = RegisterEventSource(NULL,"MySQL"))
{
switch (event_type){
case MY_ERROR_TYPE:
ReportEvent(event, (WORD)event_type, 0, MSG_DEFAULT, NULL, 1, 0, (LPCSTR*)&buffptr, NULL);
break;
case MY_WARNING_TYPE:
ReportEvent(event, (WORD)event_type, 0, MSG_DEFAULT, NULL, 1, 0, (LPCSTR*)&buffptr, NULL);
break;
case MY_INFORMATION_TYPE:
ReportEvent(event, (WORD)event_type, 0, MSG_DEFAULT, NULL, 1, 0, (LPCSTR*)&buffptr, NULL);
break;
}
DeregisterEventSource(event);
}
#endif
DBUG_VOID_RETURN;
}
void sql_print_error( const char *format, ... )
{
DBUG_ENTER( "startup_sql_print_error" );
va_list args;
va_start( args, format );
print_msg_to_log( MY_ERROR_TYPE, true, format, args );
va_end( args );
DBUG_VOID_RETURN;
}
void sql_print_warning( const char *format, ... )
{
DBUG_ENTER( "startup_sql_print_warning" );
va_list args;
va_start( args, format );
print_msg_to_log( MY_WARNING_TYPE, true, format, args );
va_end( args );
DBUG_VOID_RETURN;
}
void sql_print_information( const char *format, ... )
{
DBUG_ENTER( "startup_sql_print_information" );
va_list args;
va_start( args, format );
print_msg_to_log( MY_INFORMATION_TYPE, true, format, args );
va_end( args );
DBUG_VOID_RETURN;
}
/*void sql_init_fprintf(const char *format,...)
{
va_list args;
char buff[255];
buff[0]= 0;
va_start(args,format);
my_vsnprintf(buff,sizeof(buff)-1,format,args);
#ifdef __NT__
sql_nt_print_error(MY_ERROR_TYPE,buff);
#else
sql_win_print_error(buff);
#endif
va_end(args);
}
*/
......@@ -639,9 +639,27 @@ void key_unpack(String *to,TABLE *form,uint index);
bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields);
void init_errmessage(void);
void vprint_msg_to_log( long errType, my_bool timestamp, const char *format, va_list args );
void print_msg_to_log( long errType, my_bool timestamp, const char *format, ... );
void sql_perror(const char *message);
void sql_print_error(const char *format,...)
__attribute__ ((format (printf, 1, 2)));
/* __attribute__ ((format (printf, 1, 2)));
*/
#define MY_ERROR_TYPE 0x0001
#define MY_WARNING_TYPE 0x0002
#define MY_INFORMATION_TYPE 0x0004
/*void sql_init_perror(const char *message);*/
/*void sql_fprintf(const char *format,...)
__attribute__ ((format (printf, 1, 2)));*/
/*#define sql_fprintf(format, args...) fprintf (stderr, format, ##args) */
void sql_print_error( const char *format, ... );
void sql_print_warning( const char *format, ...);
void sql_print_information( const char *format, ...);
bool fn_format_relative_to_data_home(my_string to, const char *name,
const char *dir, const char *extension);
bool open_log(MYSQL_LOG *log, const char *hostname,
......
......@@ -5095,11 +5095,16 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
/* Initiates DEBUG - but no debugging here ! */
void option_error_reporter( const char *format, va_list args )
{
vprint_msg_to_log( MY_ERROR_TYPE, false, format, args );
}
static void get_options(int argc,char **argv)
{
int ho_error;
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, option_error_reporter )))
exit(ho_error);
#if defined(HAVE_BROKEN_REALPATH)
......
......@@ -1333,7 +1333,7 @@ static int parse_args(int argc, char **argv)
{
int ho_error;
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment