List:Commits« Previous MessageNext Message »
From:tomas Date:June 1 2007 12:32pm
Subject:bk commit into 5.1 tree (tomas:1.2143)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-06-01 14:32:43+02:00, tomas@stripped +1 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-wl2325-5.0
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-wl2325-5.0-drop6
  MERGE: 1.2071.1.80

  storage/ndb/src/common/transporter/TransporterRegistry.cpp@stripped, 2007-06-01 14:32:41+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.63.1.3

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0-drop6/RESYNC

--- 1.67/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2007-05-29 07:43:32 +02:00
+++ 1.68/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2007-06-01 14:32:41 +02:00
@@ -964,6 +964,7 @@
         {
           Uint32 * ptr;
           Uint32 sz = t->getReceiveData(&ptr);
+          transporter_recv_from(callbackObj, nodeId);
           Uint32 szUsed = unpack(ptr, sz, nodeId, ioStates[nodeId]);
           t->updateReceiveDataPtr(szUsed);
   	}
Thread
bk commit into 5.1 tree (tomas:1.2143)tomas1 Jun