MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:October 8 2010 12:30pm
Subject:bzr push into mysql-5.1-telco-7.1 branch (jonas:3875 to 3876)
View as plain text  
 3876 Jonas Oreland	2010-10-08 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/LocalProxy.cpp
      storage/ndb/src/kernel/blocks/LocalProxy.hpp
 3875 Jonas Oreland	2010-10-07 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/LocalProxy.cpp'
--- a/storage/ndb/src/kernel/blocks/LocalProxy.cpp	2010-05-03 04:49:08 +0000
+++ b/storage/ndb/src/kernel/blocks/LocalProxy.cpp	2010-10-08 08:31:34 +0000
@@ -1050,10 +1050,13 @@ LocalProxy::find_next(Ndbinfo::ScanCurso
   ndbrequire(node == getOwnNodeId());
   ndbrequire(block == number());
 
-  if (instance++ < c_workers)
+
+  Uint32 worker = (instance > 0) ? workerIndex(instance) + 1 : 0;
+
+  if (worker < c_workers)
   {
     jam();
-    cursor->currRef = switchRef(block, instance, node);
+    cursor->currRef = switchRef(block, workerInstance(worker), node);
     return true;
   }
 

=== modified file 'storage/ndb/src/kernel/blocks/LocalProxy.hpp'
--- a/storage/ndb/src/kernel/blocks/LocalProxy.hpp	2010-05-03 04:49:08 +0000
+++ b/storage/ndb/src/kernel/blocks/LocalProxy.hpp	2010-10-08 08:31:34 +0000
@@ -94,7 +94,7 @@ protected:
 
   // convert between worker index and worker instance
 
-  Uint32 workerInstance(Uint32 i) {
+  Uint32 workerInstance(Uint32 i) const {
     ndbrequire(i < c_workers);
     Uint32 ino;
     if (i < c_lqhWorkers)
@@ -104,7 +104,7 @@ protected:
     return ino;
   }
 
-  Uint32 workerIndex(Uint32 ino) {
+  Uint32 workerIndex(Uint32 ino) const {
     ndbrequire(ino != 0);
     Uint32 i;
     if (ino != 1 + MaxLqhWorkers)


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20101008123006-nyjcp4bdm9m4afh8.bundle
Thread
bzr push into mysql-5.1-telco-7.1 branch (jonas:3875 to 3876) Jonas Oreland8 Oct