bk commit into 5.0 tree (msvensson:1.2440) BUG#27597

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-14 16:04:36+02:00, msvensson@stripped +1 -0
  Bug#27597 mysqld-debug broken
  - Send errors from RTC(Runtime Error Check) to stderr instead of
  popping up an MessageBox asking to debug

  mysys/my_init.c@stripped, 2007-05-14 16:04:34+02:00, msvensson@stripped +36 -0
    Initialize a handler for RTC errors that write the problem
    description to stderr instead of popping up an MessageBox
    asking to debug

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug27597/my50-bug27597

--- 1.48/mysys/my_init.c	2007-02-22 15:59:54 +01:00
+++ 1.49/mysys/my_init.c	2007-05-14 16:04:34 +02:00
@@ -262,6 +262,34 @@ void my_parameter_handler(const wchar_t 
 }
 
 
+#ifdef __MSVC_RUNTIME_CHECKS
+#include <rtcapi.h>
+
+/* Turn off runtime checks for 'handle_rtc_failure' */
+#pragma runtime_checks("", off)
+
+/*
+  handle_rtc_failure
+  Catch the RTC error and dump it to stderr
+*/
+
+int handle_rtc_failure(int err_type, const char *file, int line,
+                       const char* module, const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  fprintf(stderr, "Error:");
+  vfprintf(stderr, format, args);
+  fprintf(stderr, " At %s:%d\n", file, line);
+  va_end(args);
+  (void) fflush(stderr);
+
+  return 0; /* Error is handled */
+}
+#pragma runtime_checks("", on)
+#endif
+
+
 static void my_win_init(void)
 {
   HKEY	hSoftMysql ;
@@ -292,6 +320,14 @@ static void my_win_init(void)
   _set_invalid_parameter_handler(my_parameter_handler);
 #endif
 #endif  
+#ifdef __MSVC_RUNTIME_CHECKS
+  /*
+    Install handler to send RTC (Runtime Error Check) warnings
+    to log file
+  */
+  _RTC_SetErrorFunc(handle_rtc_failure);
+#endif
+
   _tzset();
 
   /* apre la chiave HKEY_LOCAL_MACHINES\software\MySQL */