bzr push into mysql-5.1 branch (stewart:2808 to 2813)

[Stewart Smith]

 2813 Stewart Smith	2008-08-27
      add missing GlobalData.cpp to ndbd vm build
modified:
  storage/ndb/src/kernel/vm/CMakeLists.txt

 2812 Stewart Smith	2008-08-26
      we can (currently) only dump core on non-win32 systems.
modified:
  storage/ndb/src/kernel/vm/Emulator.cpp

 2811 Stewart Smith	2008-08-26
      add dummy_nonmt.cpp to ndbsched target for building ndbd (only do single threaded
ndbd on Win32 currently)
modified:
  storage/ndb/src/kernel/vm/CMakeLists.txt

 2810 Stewart Smith	2008-08-26
      add BLOCKProxy.cpp source files to CMakeLists.txt to build on Windows
modified:
  storage/ndb/src/kernel/blocks/CMakeLists.txt
  storage/ndb/src/kernel/blocks/backup/CMakeLists.txt
  storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt
  storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt
  storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt
  storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt

 2809 Stewart Smith	2008-08-26
      correct ndbd include baths in CMakeLists.txt
modified:
  storage/ndb/src/kernel/CMakeLists.txt

 2808 Stewart Smith	2008-08-26
      ndb_opts fixups for ndb/test/ndbapi
modified:
  storage/ndb/test/ndbapi/testIndexStat.cpp
  storage/ndb/test/ndbapi/test_event_merge.cpp

=== modified file 'storage/ndb/src/kernel/CMakeLists.txt'
--- a/storage/ndb/src/kernel/CMakeLists.txt	2008-08-20 13:22:29 +0000
+++ b/storage/ndb/src/kernel/CMakeLists.txt	2008-08-26 13:33:12 +0000
@@ -35,8 +35,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR
                     ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbutil
                     ${CMAKE_CURRENT_SOURCE_DIR}/blocks/suma
                     ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbtux
-                    ${CMAKE_SOURCE_DIR}/storage/ndb/mgmsrv
-                    ${CMAKE_SOURCE_DIR}/storage/ndb/mgmapi
+                    ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmsrv
+                    ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi
 )
 
 LINK_LIBRARIES(ndbcmvmi

=== modified file 'storage/ndb/src/kernel/blocks/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/CMakeLists.txt	2008-08-21 06:38:14 +0000
+++ b/storage/ndb/src/kernel/blocks/CMakeLists.txt	2008-08-26 13:39:44 +0000
@@ -37,18 +37,8 @@ ADD_LIBRARY(ndbblocks  STATIC
             lgman.cpp
             pgman.cpp
             print_file.cpp
+	    RestoreProxy.cpp
             restore.cpp
             tsman.cpp
+	    LocalProxy.cpp
            )
-
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
-
-ADD_LIBRARY(ndbblocks  STATIC
-            diskpage.cpp
-            lgman.cpp
-            pgman.cpp
-            print_file.cpp
-            restore.cpp
-            tsman.cpp
-           )
-

=== modified file 'storage/ndb/src/kernel/blocks/backup/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt	2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt	2008-08-26 13:39:44 +0000
@@ -17,4 +17,4 @@
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
 
 ADD_LIBRARY(ndbbackup STATIC
-            Backup.cpp BackupInit.cpp)
+            Backup.cpp BackupInit.cpp BackupProxy.cpp)

=== modified file 'storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt	2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt	2008-08-26 13:39:44 +0000
@@ -18,4 +18,4 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
 
 ADD_LIBRARY(ndbdbacc STATIC
-            DbaccInit.cpp DbaccMain.cpp)
+            DbaccInit.cpp DbaccMain.cpp DbaccProxy.cpp)

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt	2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt	2008-08-26 13:39:44 +0000
@@ -23,7 +23,7 @@ LINK_LIBRARIES(wsock32)
 ENDIF(WIN32)
 
 ADD_LIBRARY(ndbdblqh STATIC
-            DblqhInit.cpp DblqhMain.cpp)
+            DblqhInit.cpp DblqhMain.cpp DblqhProxy.cpp)
 
 ADD_EXECUTABLE(ndbd_redo_log_reader
                redoLogReader/records.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt	2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt	2008-08-26 13:39:44 +0000
@@ -37,4 +37,5 @@ ADD_LIBRARY(ndbdbtup STATIC
             DbtupVarAlloc.cpp
             tuppage.cpp
             Undo_buffer.cpp
+	    DbtupProxy.cpp
 )

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt	2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt	2008-08-26 13:39:44 +0000
@@ -28,5 +28,6 @@ ADD_LIBRARY(ndbdbtux STATIC
             DbtuxCmp.cpp
             DbtuxDebug.cpp
             DbtuxStat.cpp
+	    DbtuxProxy.cpp
 )
 

=== modified file 'storage/ndb/src/kernel/vm/CMakeLists.txt'
--- a/storage/ndb/src/kernel/vm/CMakeLists.txt	2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/kernel/vm/CMakeLists.txt	2008-08-26 14:08:56 +0000
@@ -34,6 +34,7 @@ ADD_LIBRARY(ndbkernel STATIC
             RWPool.cpp
             Rope.cpp
             WOPool.cpp
+	    GloablData.cpp
 )
 ADD_LIBRARY(ndbsched STATIC
             TimeQueue.cpp
@@ -41,4 +42,5 @@ ADD_LIBRARY(ndbsched STATIC
             FastScheduler.cpp
             TransporterCallback_nonmt.cpp
             SimulatedBlock_nonmt.cpp
+	    dummy_nonmt.cpp
 )

=== modified file 'storage/ndb/src/kernel/vm/Emulator.cpp'
--- a/storage/ndb/src/kernel/vm/Emulator.cpp	2008-08-21 06:31:42 +0000
+++ b/storage/ndb/src/kernel/vm/Emulator.cpp	2008-08-26 13:59:28 +0000
@@ -42,7 +42,9 @@ extern "C" {
   extern void (* ndb_new_handler)();
 }
 extern EventLogger * g_eventLogger;
+#ifndef NDB_WIN
 extern my_bool opt_core;
+#endif
 // instantiated and updated in NdbcntrMain.cpp
 extern Uint32 g_currentStartPhase;
 
@@ -189,9 +191,11 @@ NdbShutdown(NdbShutdownType type,
     }
     
     const char * exitAbort = 0;
+#ifndef NDB_WIN
     if (opt_core)
       exitAbort = "aborting";
     else
+#endif
       exitAbort = "exiting";
     
     if(type == NST_Watchdog){
@@ -199,11 +203,13 @@ NdbShutdown(NdbShutdownType type,
        * Very serious, don't attempt to free, just die!!
        */
       g_eventLogger->info("Watchdog shutdown completed - %s", exitAbort);
+#ifndef NDB_WIN
       if (opt_core)
       {
 	childAbort(-1,g_currentStartPhase);
       }
       else
+#endif
       {
 	childExit(-1,g_currentStartPhase);
       }
@@ -261,11 +267,13 @@ NdbShutdown(NdbShutdownType type,
 	kill(getppid(), SIGUSR1);
 #endif
       g_eventLogger->info("Error handler shutdown completed - %s", exitAbort);
+#ifndef NDB_WIN
       if (opt_core)
       {
 	childAbort(-1,g_currentStartPhase);
       }
       else
+#endif
       {
 	childExit(-1,g_currentStartPhase);
       }