From 67003d1c98988de4cd8fa0ac81bce26bcf45a173 Mon Sep 17 00:00:00 2001
From: "rburnett@build.mysql.com" <>
Date: Sat, 14 Aug 2004 03:38:37 +0200
Subject: [PATCH 01/10] 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)

---
 BitKeeper/etc/logging_ok    |   1 +
 VC++Files/sql/mysqld.dsp    |  83 ++++++++++++++
 client/mysql.cc             |   2 +-
 client/mysqladmin.c         |   2 +-
 client/mysqlbinlog.cc       |   2 +-
 client/mysqlcheck.c         |   2 +-
 client/mysqldump.c          |   2 +-
 client/mysqlimport.c        |   2 +-
 client/mysqlmanager-pwgen.c |   2 +-
 client/mysqlmanagerc.c      |   2 +-
 client/mysqlshow.c          |   2 +-
 client/mysqltest.c          |   2 +-
 extra/my_print_defaults.c   |   2 +-
 extra/mysql_install.c       |   2 +-
 extra/mysql_waitpid.c       |   2 +-
 extra/perror.c              |   2 +-
 extra/resolve_stack_dump.c  |   2 +-
 extra/resolveip.c           |   2 +-
 include/my_getopt.h         |   8 +-
 isam/isamchk.c              |   2 +-
 isam/pack_isam.c            |   2 +-
 myisam/mi_test1.c           |   2 +-
 myisam/myisam_ftdump.c      |   2 +-
 myisam/myisamchk.c          |   2 +-
 myisam/myisampack.c         |   2 +-
 mysys/my_getopt.c           |  48 +++++----
 sql/gen_lex_hash.cc         |   2 +-
 sql/log.cc                  | 208 ++++++++++++++++++++++++++++++++----
 sql/mysql_priv.h            |  22 +++-
 sql/mysqld.cc               |   7 +-
 tools/mysqlmanager.c        |   2 +-
 31 files changed, 352 insertions(+), 73 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 3ffbead8d68..cdaa06ecb0e 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -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
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 1332b74235f..3198c918a5e 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -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"
diff --git a/client/mysql.cc b/client/mysql.cc
index 66a99bbdf75..72ebfe9cf0c 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -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;
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 3bc11ec0fb0..e2843685d50 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -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);
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 7c3d22c4900..93e0b98b1e5 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -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;
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 1c5638f3c52..718b92da466 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -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)
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 6dad8182b87..c0ef07a7670 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -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;
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index ca53b74c119..751379591ff 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -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)
diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c
index 57d91b52f49..dc845008ce0 100644
--- a/client/mysqlmanager-pwgen.c
+++ b/client/mysqlmanager-pwgen.c
@@ -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;
diff --git a/client/mysqlmanagerc.c b/client/mysqlmanagerc.c
index 0001a0266e6..78485427473 100644
--- a/client/mysqlmanagerc.c
+++ b/client/mysqlmanagerc.c
@@ -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;
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 1a9aec02955..cabe55cd95e 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -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)
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 2ec07692a4d..df54b60dc97 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -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)
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index f8a7995432b..515e816f473 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -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)
diff --git a/extra/mysql_install.c b/extra/mysql_install.c
index e2783f906b9..ab44e1a055b 100644
--- a/extra/mysql_install.c
+++ b/extra/mysql_install.c
@@ -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;
diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c
index bff1752ec21..9fcabfbb53e 100644
--- a/extra/mysql_waitpid.c
+++ b/extra/mysql_waitpid.c
@@ -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)
diff --git a/extra/perror.c b/extra/perror.c
index b4aeaf00671..212b313ade4 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -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)
diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c
index c54f17a186e..8b72ab1d864 100644
--- a/extra/resolve_stack_dump.c
+++ b/extra/resolve_stack_dump.c
@@ -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);
 
   /*
diff --git a/extra/resolveip.c b/extra/resolveip.c
index d3caa9e1d45..23ea34abc42 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -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)
diff --git a/include/my_getopt.h b/include/my_getopt.h
index 11ecc66fac3..01b21951972 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -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);
 
diff --git a/isam/isamchk.c b/isam/isamchk.c
index daa9464eb4f..8603b436841 100644
--- a/isam/isamchk.c
+++ b/isam/isamchk.c
@@ -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)
diff --git a/isam/pack_isam.c b/isam/pack_isam.c
index b2e21afc743..59594ccc929 100644
--- a/isam/pack_isam.c
+++ b/isam/pack_isam.c
@@ -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];
diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c
index 8ea97c8e489..88e6c5c89d3 100644
--- a/myisam/mi_test1.c
+++ b/myisam/mi_test1.c
@@ -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;
diff --git a/myisam/myisam_ftdump.c b/myisam/myisam_ftdump.c
index 838f90feae5..35182bc8abb 100644
--- a/myisam/myisam_ftdump.c
+++ b/myisam/myisam_ftdump.c
@@ -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;
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 5377ecc18a5..e8e85345897 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -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 */
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index 872fcb49faf..51f8ad1bb11 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -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)
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 694c4685667..7524bbf318d 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -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;
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index 1f604659272..72ab1184533 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -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)
diff --git a/sql/log.cc b/sql/log.cc
index e031656cc6e..3d76f9d5634 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -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);
-  fflush(stderr);
-  va_end(args);
+	  start->tm_sec,
+	  buffer );
+  }
+  else
+    fprintf( stderr, "%s", buffer );
 
+  fputc('\n', stderr);
+  fflush(stderr);
+
+#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);
+}
+*/
+
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 2e893ead407..1bc6544b72e 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -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,
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 3f7c187ccdd..9191759b2d2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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)
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index ade6da895c6..12b5519ae9c 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -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;

From a22cdab9e9e12019a1fabce065acb52cbff9c7e4 Mon Sep 17 00:00:00 2001
From: "rburnett@build.mysql.com" <>
Date: Wed, 18 Aug 2004 22:31:01 +0200
Subject: [PATCH 02/10] BUG# 4466 - Nothing in .err when mysql service ends
 because of malformed my.ini options

mysqld.cc:
  Changed option_error_reporter to match new function header that includes LOGLEVEL enum
mysql_priv.h:
  Removed the MY_ERROR style bitmask.  Changed function headers to use new LOGLEVEL enum
log.cc:
  Changed print_buffer_to_log to print_buffer_to_file.  Remove the timestamp bool and now all log entries written to stderr are timestamped.  Removed some unused commented code.  changed to use the new LOGLEVEL enum.
my_getopt.c:
  Changed functions to use the new LOGLEVEL enum and changed the included error reporter to be default_reporter.  This reporter is used in handle_options if a reporter is not given
my_getopt.h:
  changed typedefs to use better naming convention.  Moved error bitmask into the LOGLEVEL enum and included it here.
---
 include/my_getopt.h |  20 +++++-
 mysys/my_getopt.c   |  56 +++++++----------
 sql/log.cc          | 148 +++++++++++++++++++++++---------------------
 sql/mysql_priv.h    |  16 +----
 sql/mysqld.cc       |   7 ++-
 5 files changed, 127 insertions(+), 120 deletions(-)

diff --git a/include/my_getopt.h b/include/my_getopt.h
index 01b21951972..9e26b12cb9e 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -14,6 +14,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#ifndef _my_getopt_h
+#define _my_getopt_h
+
 C_MODE_START
 
 #define GET_NO_ARG     1
@@ -50,14 +53,25 @@ 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 );
+enum LOGLEVEL {
+   ERROR_LEVEL,
+   WARNING_LEVEL,
+   INFORMATION_LEVEL
+};
+
+typedef my_bool (* my_get_one_option) (int, const struct my_option *, char * );
+typedef void (* my_error_reporter) (enum LOGLEVEL level, const char *format, ... );
 
 extern int handle_options (int *argc, char ***argv, 
-			   const struct my_option *longopts, hoGetOneOption, hoErrorReporter );
+			   const struct my_option *longopts, my_get_one_option, 
+                           my_error_reporter );
 extern void my_print_help(const struct my_option *options);
 extern void my_print_variables(const struct my_option *options);
 
 ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp);
 my_bool getopt_compare_strings(const char *s, const char *t, uint length);
+
 C_MODE_END
+
+#endif /* _my_getopt_h */
+
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 7524bbf318d..4bb9a79e299 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -56,17 +56,11 @@ char *disabled_my_option= (char*) "0";
 
 my_bool my_getopt_print_errors= 1;
 
-void report_option_error( hoErrorReporter reporter, const char *format, ... )
+void default_reporter( enum LOGLEVEL level, const char *format, ... )
 {
   va_list args;
   va_start( args, format );
-
-
-  if (reporter != NULL)
-    reporter( format, args );
-  else
-    vfprintf( stderr, format, args );
-
+  vfprintf( stderr, format, args );
   va_end( args );
 }
 
@@ -81,7 +75,8 @@ void report_option_error( hoErrorReporter reporter, const char *format, ... )
 */
 
 int handle_options(int *argc, char ***argv, 
-		   const struct my_option *longopts, hoGetOneOption get_one_option, hoErrorReporter reporter ) 
+		   const struct my_option *longopts, my_get_one_option get_one_option, 
+                   my_error_reporter reporter ) 
 {
   uint opt_found, argvpos= 0, length, i;
   my_bool end_of_options= 0, must_be_var, set_maximum_value, special_used,
@@ -95,6 +90,8 @@ int handle_options(int *argc, char ***argv,
   (*argv)++; /*      --- || ----      */
   init_variables(longopts);
 
+  if (! reporter) reporter = &default_reporter;
+
   for (pos= *argv, pos_end=pos+ *argc; pos != pos_end ; pos++)
   {
     char *cur_arg= *pos;
@@ -119,8 +116,7 @@ int handle_options(int *argc, char ***argv,
 	    if (!*++pos)
 	    {
 	      if (my_getopt_print_errors)
-		report_option_error(reporter, "%s: Option '-O' requires an argument\n",
-			progname);
+		reporter( ERROR_LEVEL, "%s: Option '-O' requires an argument\n", progname );
 	      return EXIT_ARGUMENT_REQUIRED;
 	    }
 	    cur_arg= *pos;
@@ -136,9 +132,7 @@ int handle_options(int *argc, char ***argv,
 	    if (!*cur_arg)
 	    {
 	      if (my_getopt_print_errors)
-		report_option_error(reporter,
-			"%s: Option '--set-variable' requires an argument\n",
-			progname);
+		reporter( ERROR_LEVEL, "%s: Option '--set-variable' requires an argument\n", progname );
 	      return EXIT_ARGUMENT_REQUIRED;
 	    }
 	  }
@@ -150,9 +144,7 @@ int handle_options(int *argc, char ***argv,
 	    if (!*++pos)
 	    {
 	      if (my_getopt_print_errors)
-		report_option_error( reporter,
-			"%s: Option '--set-variable' requires an argument\n",
-			progname);
+	        reporter( ERROR_LEVEL, "%s: Option '--set-variable' requires an argument\n", progname );
 	      return EXIT_ARGUMENT_REQUIRED;
 	    }
 	    cur_arg= *pos;
@@ -211,7 +203,7 @@ int handle_options(int *argc, char ***argv,
 		  if (opt_found > 1)
 		  {
 		    if (my_getopt_print_errors)
-		      report_option_error( reporter,
+		      reporter( ERROR_LEVEL,
 			      "%s: ambiguous option '--%s-%s' (--%s-%s)\n",
 			      progname, special_opt_prefix[i], cur_arg,
 			      special_opt_prefix[i], prev_found);
@@ -246,18 +238,16 @@ int handle_options(int *argc, char ***argv,
 	    if (must_be_var)
 	    {
 	      if (my_getopt_print_errors)
-		report_option_error( reporter,
-			"%s: %s: unknown variable '%s'\n", progname,
-			option_is_loose ? "WARNING" : "ERROR", cur_arg);
+		reporter( option_is_loose ? WARNING_LEVEL : ERROR_LEVEL,
+			"%s: unknown variable '%s'\n", progname, cur_arg );
 	      if (!option_is_loose)
 		return EXIT_UNKNOWN_VARIABLE;
 	    }
 	    else
 	    {
 	      if (my_getopt_print_errors)
-		report_option_error( reporter,
-			"%s: %s: unknown option '--%s'\n", progname,
-			option_is_loose ? "WARNING" : "ERROR", cur_arg);
+		reporter( option_is_loose ? WARNING_LEVEL : ERROR_LEVEL,
+			"%s: unknown option '--%s'\n", progname, cur_arg );
 	      if (!option_is_loose)
 		return EXIT_UNKNOWN_OPTION;
 	    }
@@ -273,14 +263,14 @@ int handle_options(int *argc, char ***argv,
 	  if (must_be_var)
 	  {
 	    if (my_getopt_print_errors)
-	      report_option_error( reporter, "%s: variable prefix '%s' is not unique\n",
+	      reporter( ERROR_LEVEL, "%s: variable prefix '%s' is not unique\n",
 		      progname, cur_arg);
 	    return EXIT_VAR_PREFIX_NOT_UNIQUE;
 	  }
 	  else
 	  {
 	    if (my_getopt_print_errors)
-	      report_option_error( reporter, "%s: ambiguous option '--%s' (%s, %s)\n",
+	      reporter( ERROR_LEVEL, "%s: ambiguous option '--%s' (%s, %s)\n",
 		      progname, cur_arg, prev_found, optp->name);
 	    return EXIT_AMBIGUOUS_OPTION;
 	  }
@@ -288,7 +278,7 @@ int handle_options(int *argc, char ***argv,
 	if (must_be_var && optp->var_type == GET_NO_ARG)
 	{
 	  if (my_getopt_print_errors)
-	    report_option_error( reporter, "%s: option '%s' cannot take an argument\n",
+	    reporter( ERROR_LEVEL, "%s: option '%s' cannot take an argument\n",
 		    progname, optp->name);
 	  return EXIT_NO_ARGUMENT_ALLOWED;
 	}
@@ -297,7 +287,7 @@ int handle_options(int *argc, char ***argv,
 	  if (optend && optp->var_type != GET_BOOL)
 	  {
 	    if (my_getopt_print_errors)
-	      report_option_error( reporter, "%s: option '--%s' cannot take an argument\n",
+	      reporter( ERROR_LEVEL, "%s: option '--%s' cannot take an argument\n",
 		      progname, optp->name);
 	    return EXIT_NO_ARGUMENT_ALLOWED;
 	  }
@@ -335,7 +325,7 @@ int handle_options(int *argc, char ***argv,
 	  if (!*++pos)
 	  {
 	    if (my_getopt_print_errors)
-	      report_option_error( reporter, "%s: option '--%s' requires an argument\n",
+	      reporter( ERROR_LEVEL, "%s: option '--%s' requires an argument\n",
 		      progname, optp->name);
 	    return EXIT_ARGUMENT_REQUIRED;
 	  }
@@ -385,7 +375,7 @@ int handle_options(int *argc, char ***argv,
 		  if (!pos[1])
 		  {
                     if (my_getopt_print_errors)
-                      report_option_error( reporter,
+                      reporter( ERROR_LEVEL,
                               "%s: option '-%c' requires an argument\n",
                               progname, optp->id);
                     return EXIT_ARGUMENT_REQUIRED;
@@ -397,7 +387,7 @@ int handle_options(int *argc, char ***argv,
 	      }
 	      if ((error= setval(optp, argument, set_maximum_value)))
 	      {
-		report_option_error( reporter,
+		reporter( ERROR_LEVEL,
 			"%s: Error while setting value '%s' to '%s'\n",
 			progname, argument, optp->name);
 		return error;
@@ -409,7 +399,7 @@ int handle_options(int *argc, char ***argv,
 	  if (!opt_found)
 	  {
 	    if (my_getopt_print_errors)
-	      report_option_error( reporter,
+	      reporter( ERROR_LEVEL,
 		      "%s: unknown option '-%c'\n", progname, *optend);
 	    return EXIT_UNKNOWN_OPTION;
 	  }
@@ -419,7 +409,7 @@ int handle_options(int *argc, char ***argv,
       }
       if ((error= setval(optp, argument, set_maximum_value)))
       {
-	report_option_error( reporter,
+	reporter( ERROR_LEVEL,
 		"%s: Error while setting value '%s' to '%s'\n",
 		progname, argument, optp->name);
 	return error;
diff --git a/sql/log.cc b/sql/log.cc
index 3d76f9d5634..a487de250db 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1716,41 +1716,32 @@ static bool test_if_number(register const char *str,
 } /* test_if_number */
 
 
-void print_buffer_to_log( my_bool timestamp, const char *buffer )
+void print_buffer_to_file( enum LOGLEVEL level, const char *buffer )
 {
   time_t skr;
   struct tm tm_tmp;
   struct tm *start;
 
-  DBUG_ENTER("sql_print_buffer_to_log");
+  DBUG_ENTER("startup_print_buffer_to_log");
 
-#if !defined(__WIN__) && !defined(__NT__)
   VOID(pthread_mutex_lock(&LOCK_error_log));
-#endif
 
-  if (timestamp)
-  {
-    skr=time(NULL);
-    localtime_r(&skr, &tm_tmp);
-    start=&tm_tmp;
-    fprintf( stderr, "%02d%02d%02d %2d:%02d:%02d  %s",
+  skr=time(NULL);
+  localtime_r(&skr, &tm_tmp);
+  start=&tm_tmp;
+  fprintf( stderr, "%02d%02d%02d %2d:%02d:%02d  [%s] %s\n",
     	  start->tm_year % 100,
   	  start->tm_mon+1,
 	  start->tm_mday,
 	  start->tm_hour,
 	  start->tm_min,
 	  start->tm_sec,
+          level == ERROR_LEVEL ? "ERROR" : level == WARNING_LEVEL ? "WARNING" : "INFORMATION",
 	  buffer );
-  }
-  else
-    fprintf( stderr, "%s", buffer );
 
-  fputc('\n', stderr);
   fflush(stderr);
 
-#if !defined(__WIN__) && !defined(__NT__)
   VOID(pthread_mutex_unlock(&LOCK_error_log));
-#endif
 
   DBUG_VOID_RETURN;
 }
@@ -1819,28 +1810,82 @@ bool flush_error_log()
   * @param ... values for the message
   * @return void
 */
-void print_msg_to_log( long event_type, my_bool timestamp, const char *format, ... )
+void print_msg_to_log( LOGLEVEL level, const char *format, ... )
 {
   va_list args;
 
-  DBUG_ENTER("startup_print_msg_to_logo");
+  DBUG_ENTER("startup_print_msg_to_log");
 
   va_start( args, format );
-  vprint_msg_to_log( event_type, timestamp, format, args );
+  vprint_msg_to_log( level, 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
+
+#ifdef __NT__
+void print_buffer_to_nt_eventlog( enum LOGLEVEL level, char *buff, int buffLen )
+{
+  HANDLE event;
+  char   *buffptr;
+  LPCSTR *buffmsgptr;
+
+  buffptr = buff;
+  if (strlen(buff) > (uint)(buffLen-4))
+  {
+    char *newBuff = new char[ strlen(buff) + 4 ];
+    strcpy( newBuff, buff );
+    buffptr = newBuff;
+  }
+  strcat( buffptr, "\r\n\r\n" );
+  buffmsgptr = (LPCSTR*)&buffptr;
+
+  setupWindowsEventSource();
+  if (event = RegisterEventSource(NULL,"MySQL"))
+  {
+    switch (level){
+      case ERROR_LEVEL:
+        ReportEvent(event, EVENTLOG_ERROR_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+        break;
+      case WARNING_LEVEL:
+        ReportEvent(event, EVENTLOG_WARNING_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+        break;
+      case INFORMATION_LEVEL:
+        ReportEvent(event, EVENTLOG_INFORMATION_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+        break;
+    }
+    DeregisterEventSource(event);
+  }
+
+  // if we created a string buffer, then delete it
+  if ( buffptr != buff )
+    delete[] buffptr;
+
+
+  DBUG_VOID_RETURN;
+}
+#endif
+
+/*
+  Prints a printf style message to the error log and, under NT, to the Windows event log.
+
+  SYNOPSIS
+    vprint_msg_to_log()
+    event_type                  Type of event to write (Error, Warning, or Info)
+    format                      Printf style format of message
+    args                        va_list list of arguments for the message    
+
+  NOTE
+
+  IMPLEMENTATION
+    This function prints the message into a buffer and then sends that buffer to other
+    functions to write that message to other logging sources.
+
+  RETURN VALUES
+    void
 */
-void vprint_msg_to_log(long event_type, my_bool timestamp, const char *format, va_list args)
+void vprint_msg_to_log(enum LOGLEVEL level, const char *format, va_list args)
 {
   char   buff[1024];
 
@@ -1848,45 +1893,27 @@ void vprint_msg_to_log(long event_type, my_bool timestamp, const char *format, v
 
   my_vsnprintf( buff, sizeof(buff)-5, format, args );
 
-  print_buffer_to_log( timestamp, buff );
+  print_buffer_to_file( level, 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); 
-  }
+  print_buffer_to_nt_eventlog( level, buff, sizeof(buff) );
 #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 );
+  print_msg_to_log( ERROR_LEVEL, format, args );
   va_end( args );
 
   DBUG_VOID_RETURN;
@@ -1898,7 +1925,7 @@ void sql_print_warning( const char *format, ... )
 
   va_list args;
   va_start( args, format );
-  print_msg_to_log( MY_WARNING_TYPE, true, format, args );
+  print_msg_to_log( WARNING_LEVEL, format, args );
   va_end( args );
 
   DBUG_VOID_RETURN;
@@ -1910,25 +1937,8 @@ void sql_print_information( const char *format, ... )
 
   va_list args;
   va_start( args, format );
-  print_msg_to_log( MY_INFORMATION_TYPE, true, format, args );
+  print_msg_to_log( INFORMATION_LEVEL, 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);
-}
-*/
-
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 1bc6544b72e..ed8b4bd2457 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -24,6 +24,7 @@
 #include <thr_lock.h>
 #include <my_base.h>			/* Needed by field.h */
 #include <my_bitmap.h>
+#include <my_getopt.h>
 
 #ifdef __EMX__
 #undef write  /* remove pthread.h macro definition for EMX */
@@ -639,21 +640,10 @@ 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 vprint_msg_to_log( enum LOGLEVEL level, const char *format, va_list args );
+void print_msg_to_log( enum LOGLEVEL level, const char *format, ... );
 void sql_perror(const char *message);
-	       /* __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, ...); 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9191759b2d2..d70f61c5c22 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5095,9 +5095,12 @@ 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 )
+void option_error_reporter( enum LOGLEVEL level, const char *format, ... )
 {
-  vprint_msg_to_log( MY_ERROR_TYPE, false, format, args );
+  va_list args;
+  va_start( args, format );
+  vprint_msg_to_log( level, format, args );
+  va_end( args );
 }
 
 static void get_options(int argc,char **argv)

From eb04e6da07631f880bd116e82da24a55412f8d3c Mon Sep 17 00:00:00 2001
From: "rburnett@build.mysql.com" <>
Date: Thu, 19 Aug 2004 17:56:32 +0200
Subject: [PATCH 03/10] Bug #4466  	Nothing in .err when mysql service
 ends because of malformed my.ini options

mysqld.cc:
  Changed LOGLEVEL enum to loglevel
mysql_priv.h, log.cc:
  Changed LOGLEVEL to loglevel.  Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused.
my_getopt.c, my_getopt.h:
  Renamed LOGLEVEL to loglevel to match coding standards
---
 include/my_getopt.h |  4 ++--
 mysys/my_getopt.c   |  2 +-
 sql/log.cc          | 45 +++++++++++++--------------------------------
 sql/mysql_priv.h    |  3 +--
 sql/mysqld.cc       |  2 +-
 5 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/include/my_getopt.h b/include/my_getopt.h
index 9e26b12cb9e..f3db2a70a92 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -53,14 +53,14 @@ struct my_option
 extern char *disabled_my_option;
 extern my_bool my_getopt_print_errors;
 
-enum LOGLEVEL {
+enum loglevel {
    ERROR_LEVEL,
    WARNING_LEVEL,
    INFORMATION_LEVEL
 };
 
 typedef my_bool (* my_get_one_option) (int, const struct my_option *, char * );
-typedef void (* my_error_reporter) (enum LOGLEVEL level, const char *format, ... );
+typedef void (* my_error_reporter) (enum loglevel level, const char *format, ... );
 
 extern int handle_options (int *argc, char ***argv, 
 			   const struct my_option *longopts, my_get_one_option, 
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 4bb9a79e299..91671fcff5b 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -56,7 +56,7 @@ char *disabled_my_option= (char*) "0";
 
 my_bool my_getopt_print_errors= 1;
 
-void default_reporter( enum LOGLEVEL level, const char *format, ... )
+void default_reporter( enum loglevel level, const char *format, ... )
 {
   va_list args;
   va_start( args, format );
diff --git a/sql/log.cc b/sql/log.cc
index a487de250db..9743fdf8a37 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1716,13 +1716,13 @@ static bool test_if_number(register const char *str,
 } /* test_if_number */
 
 
-void print_buffer_to_file( enum LOGLEVEL level, const char *buffer )
+void print_buffer_to_file( enum loglevel level, const char *buffer )
 {
   time_t skr;
   struct tm tm_tmp;
   struct tm *start;
 
-  DBUG_ENTER("startup_print_buffer_to_log");
+  DBUG_ENTER("print_buffer_to_log");
 
   VOID(pthread_mutex_lock(&LOCK_error_log));
 
@@ -1802,35 +1802,16 @@ 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( LOGLEVEL level, const char *format, ... )
-{
-  va_list args;
-
-  DBUG_ENTER("startup_print_msg_to_log");
-
-  va_start( args, format );
-  vprint_msg_to_log( level, format, args );
-  va_end( args );
-
-  DBUG_VOID_RETURN;
-}
-
 
 #ifdef __NT__
-void print_buffer_to_nt_eventlog( enum LOGLEVEL level, char *buff, int buffLen )
+void print_buffer_to_nt_eventlog( enum loglevel level, char *buff, int buffLen )
 {
   HANDLE event;
   char   *buffptr;
   LPCSTR *buffmsgptr;
 
+  DBUG_ENTER( "print_buffer_to_nt_eventlog" );
+
   buffptr = buff;
   if (strlen(buff) > (uint)(buffLen-4))
   {
@@ -1885,11 +1866,11 @@ void print_buffer_to_nt_eventlog( enum LOGLEVEL level, char *buff, int buffLen )
   RETURN VALUES
     void
 */
-void vprint_msg_to_log(enum LOGLEVEL level, const char *format, va_list args)
+void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
 {
   char   buff[1024];
 
-  DBUG_ENTER("startup_vprint_msg_to_log");
+  DBUG_ENTER("vprint_msg_to_log");
 
   my_vsnprintf( buff, sizeof(buff)-5, format, args );
 
@@ -1909,11 +1890,11 @@ void vprint_msg_to_log(enum LOGLEVEL level, const char *format, va_list args)
 
 void sql_print_error( const char *format, ... ) 
 {
-  DBUG_ENTER( "startup_sql_print_error" );
+  DBUG_ENTER( "sql_print_error" );
 
   va_list args;
   va_start( args, format );
-  print_msg_to_log( ERROR_LEVEL, format, args );
+  vprint_msg_to_log( ERROR_LEVEL, format, args );
   va_end( args );
 
   DBUG_VOID_RETURN;
@@ -1921,11 +1902,11 @@ void sql_print_error( const char *format, ... )
 
 void sql_print_warning( const char *format, ... ) 
 {
-  DBUG_ENTER( "startup_sql_print_warning" );
+  DBUG_ENTER( "sql_print_warning" );
 
   va_list args;
   va_start( args, format );
-  print_msg_to_log( WARNING_LEVEL, format, args );
+  vprint_msg_to_log( WARNING_LEVEL, format, args );
   va_end( args );
 
   DBUG_VOID_RETURN;
@@ -1933,11 +1914,11 @@ void sql_print_warning( const char *format, ... )
 
 void sql_print_information( const char *format, ... ) 
 {
-  DBUG_ENTER( "startup_sql_print_information" );
+  DBUG_ENTER( "sql_print_information" );
 
   va_list args;
   va_start( args, format );
-  print_msg_to_log( INFORMATION_LEVEL, format, args );
+  vprint_msg_to_log( INFORMATION_LEVEL, format, args );
   va_end( args );
 
   DBUG_VOID_RETURN;
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index ed8b4bd2457..e86604df659 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -640,10 +640,9 @@ 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( enum LOGLEVEL level, const char *format, va_list args );
-void print_msg_to_log( enum LOGLEVEL level, const char *format, ... );
 void sql_perror(const char *message);
 
+void vprint_msg_to_log( enum loglevel level, const char *format, va_list args );
 void sql_print_error( const char *format, ... );
 void sql_print_warning( const char *format, ...); 
 void sql_print_information( const char *format, ...); 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d70f61c5c22..a27298c254c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5095,7 +5095,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 }
 	/* Initiates DEBUG - but no debugging here ! */
 
-void option_error_reporter( enum LOGLEVEL level, const char *format, ... )
+void option_error_reporter( enum loglevel level, const char *format, ... )
 {
   va_list args;
   va_start( args, format );

From a7c4e100edd7fe6947e1150a505e3f3a6b93763e Mon Sep 17 00:00:00 2001
From: "rburnett@build.mysql.com" <>
Date: Thu, 19 Aug 2004 20:26:00 +0200
Subject: [PATCH 04/10] Bug #4466  	Nothing in .err when mysql service
 ends because of malformed my.ini options

my_getopt.c:
  Moved the inclusion of my_getopt.h down below the inclusion of my_sys.h so that enum loglevel definition would be available
my_sys.h, my_getopt.h:
  moved definition of enum loglevel from my_getopt.h to my_sys.h
---
 include/my_getopt.h | 6 ------
 include/my_sys.h    | 6 ++++++
 mysys/my_getopt.c   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/my_getopt.h b/include/my_getopt.h
index f3db2a70a92..f5b847f7dda 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -53,12 +53,6 @@ struct my_option
 extern char *disabled_my_option;
 extern my_bool my_getopt_print_errors;
 
-enum loglevel {
-   ERROR_LEVEL,
-   WARNING_LEVEL,
-   INFORMATION_LEVEL
-};
-
 typedef my_bool (* my_get_one_option) (int, const struct my_option *, char * );
 typedef void (* my_error_reporter) (enum loglevel level, const char *format, ... );
 
diff --git a/include/my_sys.h b/include/my_sys.h
index 4934df3c4e5..9e43889d0e0 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -261,6 +261,12 @@ typedef struct st_typelib {	/* Different types saved here */
   const char **type_names;
 } TYPELIB;
 
+enum loglevel {
+   ERROR_LEVEL,
+   WARNING_LEVEL,
+   INFORMATION_LEVEL
+};
+
 enum cache_type
 {
   READ_CACHE,WRITE_CACHE,
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 91671fcff5b..c471a30eb35 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -17,10 +17,10 @@
 #include <my_global.h>
 #include <m_string.h>
 #include <stdlib.h>
-#include <my_getopt.h>
 #include <assert.h>
 #include <my_sys.h>
 #include <mysys_err.h>
+#include <my_getopt.h>
 
 static int findopt(char *optpat, uint length,
 		   const struct my_option **opt_res,

From b8c7b6b0ae26b657a9a2183ecbb362251f6eb1d6 Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Tue, 24 Aug 2004 19:05:42 +0200
Subject: [PATCH 05/10] All 'Makefile's must use '$(AR)' (not just 'ar')
 because the variable may contain options.

---
 BitKeeper/etc/logging_ok | 1 +
 libmysqld/Makefile.am    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index d16de3077f3..441e8a1f1c1 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -57,6 +57,7 @@ jcole@main.burghcom.com
 jcole@mugatu.spaceapes.com
 jcole@sarvik.tfr.cafe.ee
 jcole@tetra.spaceapes.com
+joerg@mysql.com
 jorge@linux.jorge.mysql.com
 kaj@work.mysql.com
 konstantin@mysql.com
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 54c7ada4a85..ef0f61b4234 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -89,9 +89,9 @@ libmysqld.a:	libmysqld_int.a $(INC_LIB)
 		  cd tmp ; \
 		  for file in *.a ; do \
 		    bfile=`basename $$file .a` ; \
-		    ar x $$file; \
+		    $(AR) x $$file; \
 		    for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \
-		    ar q ../libmysqld_int2.a *.o ; \
+		    $(AR) q ../libmysqld_int2.a *.o ; \
 		    rm -f *.o ; \
 		  done ; \
 		  cd .. ; \

From 852181a21e78ae22955e0198375e53eea45a923b Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Tue, 24 Aug 2004 20:17:23 +0300
Subject: [PATCH 06/10] buf0rea.c:   Fix bug: if there was little file I/O in
 InnoDB, but the insert buffer was used, it could happen that 'Pending normal
 aio reads' was bigger than 0, but the I/O handler thread did not get waken up
 in 600 seconds. This resulted in a hang, and crashing of InnoDB.

---
 innobase/buf/buf0rea.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/innobase/buf/buf0rea.c b/innobase/buf/buf0rea.c
index 83397c9c7fa..a808c282934 100644
--- a/innobase/buf/buf0rea.c
+++ b/innobase/buf/buf0rea.c
@@ -546,6 +546,8 @@ buf_read_ibuf_merge_pages(
 		}
 	}
 	
+	os_aio_simulated_wake_handler_threads();
+
 	/* Flush pages from the end of the LRU list if necessary */
 	buf_flush_free_margin();
 

From 358900236ab52a1021df1cb4d95158c7ee40705a Mon Sep 17 00:00:00 2001
From: "rburnett@build.mysql.com" <>
Date: Wed, 25 Aug 2004 15:12:31 +0200
Subject: [PATCH 07/10] Bug #4792  	lower_case_table_names does not
 resolve db.tbl.column in SELECT list

sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
---
 sql/sql_base.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 7b1b3cc1b7a..26ce394ec37 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2062,9 +2062,20 @@ bool
 insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
 	      const char *table_name, List_iterator<Item> *it)
 {
+  char name_buff[NAME_LEN+1];
   uint found;
   DBUG_ENTER("insert_fields");
 
+
+  if (db_name && lower_case_table_names)
+  {
+    /* convert database to lower case for comparison */
+    strmake( name_buff, db_name, sizeof(name_buff)-1 );
+    casedn_str( name_buff );
+    db_name = name_buff;
+  }
+
+
   found=0;
   for (; tables ; tables=tables->next)
   {

From 1e0e96a0d2484da14175092e60f3ab119946dd2d Mon Sep 17 00:00:00 2001
From: "rburnett@build.mysql.com" <>
Date: Wed, 25 Aug 2004 17:25:38 +0200
Subject: [PATCH 08/10] Test case for Bug #4792  	lower_case_table_names
 does not resolve db.tbl.column in SELECT list

lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
---
 mysql-test/r/lowercase_table.result |  9 +++++++++
 mysql-test/t/lowercase_table.test   | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/r/lowercase_table.result
index 16bc92cb711..5acab254511 100644
--- a/mysql-test/r/lowercase_table.result
+++ b/mysql-test/r/lowercase_table.result
@@ -39,3 +39,12 @@ Unknown table 'T1' in field list
 select count(bags.a) from t1 as Bags;
 Unknown table 'bags' in field list
 drop table t1;
+create database foo;
+use foo;
+create table t1 (a int);
+select FOO.t1.* from FOO.t1;
+a
+alter table t1 rename to T1;
+select FOO.t1.* from FOO.t1;
+a
+drop database FOO;
diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/t/lowercase_table.test
index 5bc19f26c0e..d52c60baea7 100644
--- a/mysql-test/t/lowercase_table.test
+++ b/mysql-test/t/lowercase_table.test
@@ -30,3 +30,14 @@ select count(T1.a) from t1;
 --error 1109
 select count(bags.a) from t1 as Bags;
 drop table t1;
+
+#
+# Test all caps database name
+#
+create database foo;
+use foo;
+create table t1 (a int);
+select FOO.t1.* from FOO.t1;
+alter table t1 rename to T1;
+select FOO.t1.* from FOO.t1;
+drop database FOO;

From 4fccf1c4ac8d8eb6d752a45fb380b09c24b156da Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Thu, 26 Aug 2004 00:37:25 +0300
Subject: [PATCH 09/10] Remove default argument to mysql_truncate() Update to
 new valgrind

---
 mysql-test/mysql-test-run.sh | 2 +-
 sql/mysql_priv.h             | 2 +-
 sql/sql_parse.cc             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 449b7015188..fedb2ea89b4 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -352,7 +352,7 @@ while test $# -gt 0; do
         $ECHO "You need to have the 'valgrind' program in your PATH to run mysql-test-run with option --valgrind. Valgrind's home page is http://developer.kde.org/~sewardj ."
         exit 1
       fi
-      VALGRIND="$VALGRIND --alignment=8 --leak-check=yes --num-callers=16"
+      VALGRIND="$VALGRIND --tool=memcheck --alignment=8 --leak-check=yes --num-callers=16"
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc --skip-bdb"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc --skip-bdb"
       SLEEP_TIME_AFTER_RESTART=10
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 2e893ead407..3fba75d7140 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -477,7 +477,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields,
 void kill_delayed_threads(void);
 int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, ORDER *order,
                  ha_rows rows, ulong options);
-int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok=0);
+int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok);
 TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update);
 TABLE *open_table(THD *thd,const char *db,const char *table,const char *alias,
 		  bool *refresh);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1f0af05a460..7b0924ff108 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2046,7 +2046,7 @@ mysql_execute_command(void)
       send_error(&thd->net,ER_LOCK_OR_ACTIVE_TRANSACTION,NullS);
       goto error;
     }
-    res=mysql_truncate(thd,tables);
+    res=mysql_truncate(thd, tables, 0);
     break;
   case SQLCOM_DELETE:
   {

From b9270a16fde3c29a87d54feb9fe02aa11416e896 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 26 Aug 2004 12:25:14 +0200
Subject: [PATCH 10/10]  - Updated RPM spec file: MySQL-Max now requires
 MySQL-server instead    of MySQL (BUG#3860)

---
 support-files/mysql.spec.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index b6243cbd4ad..eb5b469c8da 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -153,7 +153,7 @@ Summary: MySQL - server with Berkeley BD, RAID and UDF support
 Group: Applications/Databases
 Provides: mysql-Max
 Obsoletes: mysql-Max
-Requires: MySQL >= 4.0
+Requires: MySQL-server >= 4.0
 
 %description Max 
 Optional MySQL server binary that supports additional features like
@@ -588,8 +588,13 @@ fi
 %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 
 # The spec file changelog only includes changes made to the spec file
-# itself
+# itself - note that they must be ordered by date (important when
+# merging BK trees)
 %changelog 
+* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
+
+- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
+
 * Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
 
 - Added libmygcc.a to the devel subpackage (required to link applications