bk commit into 5.1 tree (jonas:1.2587)

Below is the list of changes that have just been committed into a local 5.1 repository of jonas. When jonas does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository.
For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@1.2587, 2007-10-01 00:05:14+02:00, jonas@perch.ndb.mysql.com +2 -0   ndb - fix introduced bug in ndbdd_backup

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.26, 2007-10-01 00:05:12+02:00, jonas@perch.ndb.mysql.com +1 -1     Fix ndb_dd_backup

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.20, 2007-10-01 00:05:12+02:00, jonas@perch.ndb.mysql.com +0 -26     remove duplicates

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/telco-6.1

--- 1.19/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-10-01 00:05:18 +02:00

+++ 1.20/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-10-01 00:05:19 +02:00

   INITIALIZER(runWaitStarted);
   STEP(runBug29167);
 }
-TESTCASE("SR_DD_1", "")
-{

• INITIALIZER(runWaitStarted);
• STEP(runSR_DD_1);
• FINALIZER(runClearTable);
  -}
  -TESTCASE("SR_DD_1_LCP", "")
  -{
  
• TC_PROPERTY("LCP", 1);
• INITIALIZER(runWaitStarted);
• STEP(runSR_DD_1);
• FINALIZER(runClearTable);
  -}
  -TESTCASE("SR_DD_2", "")
  -{
  
• INITIALIZER(runWaitStarted);
• STEP(runSR_DD_2);
• FINALIZER(runClearTable);
  -}
  -TESTCASE("SR_DD_2_LCP", "")
  -{
  
• TC_PROPERTY("LCP", 1);
• INITIALIZER(runWaitStarted);
• STEP(runSR_DD_2);
• FINALIZER(runClearTable);
  -}
  NDBT_TESTSUITE_END(testSystemRestart);

 int main(int argc, const char** argv){

• 1.25/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp 2007-10-01 00:05:19 +02:00 +++ 1.26/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp 2007-10-01 00:05:19 +02:00 @@ -771,7 +771,7 @@ uncommitted = committed = ~(unsigned)0; int ret = tsman.get_page_free_bits(&key, &uncommitted, &committed); ndbrequire(ret == 0);
  - if (committed == 0) {
  + if (committed == 0 && uncommitted == 0) { // skip empty page jam(); pos.m_get = ScanPos::Get_next_page_dd;

--

MySQL Code Commits Mailing List
For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.com Received on Sun Sep 30 18:05:49 2007