bzr commit into mysql-5.1-telco-6.4 branch (jonas:2664)

[jonas]

#At file:///home/jonas/src/telco-6.4/

 2664 jonas@stripped	2008-06-18 [merge]
      merge
modified:
  storage/ndb/test/ndbapi/testInterpreter.cpp
  storage/ndb/test/ndbapi/testSystemRestart.cpp
  storage/ndb/test/ndbapi/test_event.cpp
  storage/ndb/test/run-test/daily-basic-tests.txt

=== modified file 'storage/ndb/test/ndbapi/testInterpreter.cpp'
--- a/storage/ndb/test/ndbapi/testInterpreter.cpp	2008-05-23 09:07:58 +0000
+++ b/storage/ndb/test/ndbapi/testInterpreter.cpp	2008-06-18 14:55:21 +0000
@@ -206,8 +206,9 @@ int runTestBug19537(NDBT_Context* ctx, N
   // Load 64-bit constant into register 1 and
   // write from register 1 to 32-bit column KOL2
   const Uint64 reg_val = 0x0102030405060708ULL;
-
-  const Uint32* reg_ptr32 = (const Uint32*)&reg_val;
+  Uint32 reg_ptr32[2];
+  memcpy(reg_ptr32+0, (Uint8*)&reg_val, sizeof(Uint32));
+  memcpy(reg_ptr32+1, ((Uint8*)&reg_val)+4, sizeof(Uint32));
   if (reg_ptr32[0] == 0x05060708 && reg_ptr32[1] == 0x01020304) {
     g_err << "runTestBug19537: platform is LITTLE endian" << endl;
   } else if (reg_ptr32[0] == 0x01020304 && reg_ptr32[1] == 0x05060708) {

=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2008-03-25 15:47:07 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2008-06-18 15:10:41 +0000
@@ -1271,7 +1271,7 @@ runBug29167(NDBT_Context* ctx, NDBT_Step
   NdbRestarter restarter;
   const Uint32 nodeCount = restarter.getNumDbNodes();
 
-  if (nodeCount < 2)
+  if (nodeCount < 4)
     return NDBT_OK;
 
   int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT, 0 };

=== modified file 'storage/ndb/test/ndbapi/test_event.cpp'
--- a/storage/ndb/test/ndbapi/test_event.cpp	2008-06-17 08:54:54 +0000
+++ b/storage/ndb/test/ndbapi/test_event.cpp	2008-06-18 15:10:41 +0000
@@ -1806,7 +1806,6 @@ runBug31701(NDBT_Context* ctx, NDBT_Step
   int records = ctx->getNumRecords();
   HugoTransactions hugoTrans(*ctx->getTab());
   
-  if(ctx->getPropertyWait("LastGCI", ~(Uint32)0))
   if(ctx->getPropertyWait("LastGCI_hi", ~(Uint32)0))
   {
     g_err << "FAIL " << __LINE__ << endl;

=== modified file 'storage/ndb/test/run-test/daily-basic-tests.txt'
--- a/storage/ndb/test/run-test/daily-basic-tests.txt	2008-06-17 08:56:08 +0000
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt	2008-06-18 15:15:22 +0000
@@ -467,10 +467,6 @@ args: -n ScanReadWhileNodeIsDown D1 D2 
 
 max-time: 500
 cmd: testScan
-args: -n ScanRestart T1 D1 D2 
-
-max-time: 500
-cmd: testScan
 args: -l 100 -n Scan-bug8262 T6 D1 D2
 
 max-time: 500