bzr push into mysql-6.0-falcon branch (vvaintroub:2812)

[Vladislav Vaintroub]

 2812 Vladislav Vaintroub	2008-09-05 [merge]
      (no message)
modified:
  storage/falcon/Cache.cpp

=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c	2008-06-20 11:40:01 +0000
+++ b/mysys/stacktrace.c	2008-09-05 00:35:12 +0000
@@ -544,8 +544,11 @@ void my_write_core(int unused)
   if(hFile)
   {
     /* Create minidump */
+    MINIDUMP_TYPE dump_type = (MINIDUMP_TYPE)
+    (MiniDumpWithDataSegs|MiniDumpWithPrivateReadWriteMemory);
+
     if(pMiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(),
-      hFile, MiniDumpNormal, &info, 0, 0))
+      hFile, dump_type, &info, 0, 0))
     {
       fprintf(stderr, "Minidump written to %s\n",
         _fullpath(path, dump_fname, sizeof(path)) ? path : dump_fname);

=== modified file 'storage/falcon/Error.cpp'
--- a/storage/falcon/Error.cpp	2008-06-19 17:24:09 +0000
+++ b/storage/falcon/Error.cpp	2008-09-05 00:35:12 +0000
@@ -89,10 +89,9 @@ void Error::validateHeap(const char *whe
 void Error::debugBreak()
 {
 #ifdef _WIN32
-	DebugBreak();
-#else
-	raise (SIGABRT);
+	__debugbreak();
 #endif
+	raise (SIGABRT);
 }
 
 void Error::notYetImplemented(const char *fileName, int line)

=== modified file 'storage/maria/CMakeLists.txt'
--- a/storage/maria/CMakeLists.txt	2008-08-26 18:57:58 +0000
+++ b/storage/maria/CMakeLists.txt	2008-09-05 00:35:12 +0000
@@ -49,7 +49,7 @@ SET(MARIA_SOURCES ma_init.c ma_open.c ma
 IF(NOT SOURCE_SUBLIBS)
 
   ADD_LIBRARY(maria ${MARIA_SOURCES})
-  ADD_DEPENDENCIES(ha_falcon GenError)
+  ADD_DEPENDENCIES(maria GenError)
 
 ADD_EXECUTABLE(maria_ftdump maria_ftdump.c)
 TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib wsock32)