Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1-ndb

ndb/test/ndbapi/testIndex.cpp

@@ -26,7 +26,7 @@
 #define CHECK(b) if (!(b)) { \
   g_err << "ERR: "<< step->getName() \
          << " failed on line " << __LINE__ << endl; \
-  result = NDBT_FAILED; \
+  result = NDBT_FAILED; break;\
 } 
 
 

ndb/test/ndbapi/testNodeRestart.cpp

@@ -287,8 +287,6 @@ TESTCASE("Terror",
   STEP(runPkUpdateUntilStopped);
   STEP(runScanReadUntilStopped);
   STEP(runScanUpdateUntilStopped);
-  STEP(runInsertUntilStopped);
-  STEP(runClearTableUntilStopped);
   FINALIZER(runClearTable);
 }
 TESTCASE("FullDb", 

ndb/test/run-test/daily-devel-tests.txt

@@ -145,10 +145,10 @@ max-time: 2500
 cmd: testNodeRestart
 args: -n FiftyPercentStopAndWait T6 T8 T13 
 
-max-time: 500
-cmd: testNodeRestart
-args: -n StopOnError T1 
-
+#max-time: 500
+#cmd: testNodeRestart
+#args: -n StopOnError T1 
+#
 #
 max-time: 2500
 cmd: testIndex