bzr push into mysql-5.1-telco-7.0 branch (jonas:3675 to 3676)

[Jonas Oreland]

 3676 Jonas Oreland	2010-08-19
      ndb - add DEBUG_REDO to try to track "frequent" redo problems in 70-jonas

    added:
      storage/ndb/test/run-test/sr-dd-tests.txt
    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 3675 Jonas Oreland	2010-08-18
      ndb - llcp
        This commit fixes 2 problems found in autotest
        1) mutex during node restart needs to be kept, but LCP does no longer need to take it
           (my first version did the opposite), this to protect data for *parallel* node restart
        2) during node-restart, starting node should not move replicas belonging to other nodes
           from stored => oldStored
           

    modified:
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-08-04 21:31:59 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-08-19 08:12:48 +0000
@@ -155,14 +155,14 @@ operator<<(NdbOut& out, Operation_t op)
 //#define MARKER_TRACE 0
 //#define TRACE_SCAN_TAKEOVER 1
 
-#ifdef VM_TRACE
+#if defined VM_TRACE || defined ERROR_INSERT
 #ifndef NDB_DEBUG_REDO
 #define NDB_DEBUG_REDO
 #endif
 #endif
 
 #ifdef NDB_DEBUG_REDO
-static int DEBUG_REDO = 0;
+static int DEBUG_REDO = 1;
 #else
 #define DEBUG_REDO 0
 #endif

=== added file 'storage/ndb/test/run-test/sr-dd-tests.txt'
--- a/storage/ndb/test/run-test/sr-dd-tests.txt	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/run-test/sr-dd-tests.txt	2010-08-19 08:12:48 +0000
@@ -0,0 +1,161 @@
+#
+#
+# SYSTEM RESTARTS
+#
+max-time: 1500
+cmd: testSystemRestart
+args: -n basic T1 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR1 T1 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR1 T6 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR1 D1
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR1 D2 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR2 T1 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR2 T6 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR2 D1
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR2 D2 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR_UNDO T1 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -n SR_UNDO T6 
+
+#
+max-time: 5000
+cmd: testSystemRestart
+args: -l 1 -n SR6 T1 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -l 1 -n SR7 T1 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -l 1 -n SR8 T1 
+
+max-time: 5000
+cmd: testSystemRestart
+args: -l 1 -n SR9 T1 
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1 D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1b D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1 D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1b D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1_LCP D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1b_LCP D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1_LCP D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_1b_LCP D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2 D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2b D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2 D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2b D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2_LCP D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2b_LCP D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2_LCP D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_2b_LCP D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3 D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3b D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3 D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3b D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3_LCP D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3b_LCP D1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3_LCP D2
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR_DD_3b_LCP D2
+


Attachment: [text/bzr-bundle] bzr/[e-mail]