bzr commit into mysql-5.1-telco-6.3 branch (jonas:2909)

[Jonas Oreland]

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

 2909 Jonas Oreland	2009-03-13
      ndb - autotest - fix uninitialized variable in testSystemRestart -n SR_DD causing random testfailures
modified:
  storage/ndb/test/include/NdbBackup.hpp
  storage/ndb/test/ndbapi/testBackup.cpp
  storage/ndb/test/ndbapi/testSystemRestart.cpp

=== modified file 'storage/ndb/test/include/NdbBackup.hpp'
--- a/storage/ndb/test/include/NdbBackup.hpp	2009-03-09 09:24:02 +0000
+++ b/storage/ndb/test/include/NdbBackup.hpp	2009-03-13 16:40:17 +0000
@@ -27,6 +27,7 @@ public:
     : NdbConfig(_own_id, _addr) {};
 
   int start(unsigned & _backup_id);
+  int start() { unsigned unused =0; return start(unused); }
   int restore(unsigned _backup_id);
 
   int NFMaster(NdbRestarter& _restarter);

=== modified file 'storage/ndb/test/ndbapi/testBackup.cpp'
--- a/storage/ndb/test/ndbapi/testBackup.cpp	2009-03-09 09:24:02 +0000
+++ b/storage/ndb/test/ndbapi/testBackup.cpp	2009-03-13 16:40:17 +0000
@@ -160,12 +160,11 @@ int runBackupRandom(NDBT_Context* ctx, N
 int
 runBackupLoop(NDBT_Context* ctx, NDBT_Step* step){
   NdbBackup backup(GETNDB(step)->getNodeId()+1);
-  unsigned backupId = 0;
   
   int loops = ctx->getNumLoops();
   while(!ctx->isTestStopped() && loops--)
   {
-    if (backup.start(backupId) == -1)
+    if (backup.start() == -1)
     {
       sleep(1);
       loops++;

=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2008-08-22 22:09:50 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2009-03-13 16:40:17 +0000
@@ -1372,7 +1372,6 @@ int runSR_DD_1(NDBT_Context* ctx, NDBT_S
   bool all = ctx->getProperty("ALL", (unsigned)0);
 
   Uint32 i = 1;
-  Uint32 backupId;
 
   int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
   int lcp = DumpStateOrd::DihMinTimeBetweenLCP;
@@ -1432,7 +1431,7 @@ int runSR_DD_1(NDBT_Context* ctx, NDBT_S
     CHECK(restarter.waitClusterStarted() == 0);
     
     ndbout << "Starting backup..." << flush;
-    CHECK(backup.start(backupId) == 0);
+    CHECK(backup.start() == 0);
     ndbout << "done" << endl;
 
     int cnt = 0;
@@ -1467,7 +1466,6 @@ int runSR_DD_2(NDBT_Context* ctx, NDBT_S
   bool all = ctx->getProperty("ALL", (unsigned)0);
 
   Uint32 i = 1;
-  Uint32 backupId;
 
   int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
   int lcp = DumpStateOrd::DihMinTimeBetweenLCP;
@@ -1522,7 +1520,7 @@ int runSR_DD_2(NDBT_Context* ctx, NDBT_S
     CHECK(restarter.waitClusterStarted() == 0);
     
     ndbout << "Starting backup..." << flush;
-    CHECK(backup.start(backupId) == 0);
+    CHECK(backup.start() == 0);
     ndbout << "done" << endl;
 
     int cnt = 0;