MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jonas Date:August 15 2006 7:38am
Subject:bk commit into 5.1 tree (jonas:1.2260)
View as plain text  
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@stripped, 2006-08-15 09:38:21+02:00, jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
  into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
  MERGE: 1.2256.1.16

  mysql-test/t/disabled.def@stripped, 2006-08-15 09:38:18+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.185.1.1

  sql/ha_ndbcluster.cc@stripped, 2006-08-15 09:38:18+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.346.1.2

  sql/ha_ndbcluster_binlog.cc@stripped, 2006-08-15 09:38:18+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.77.1.1

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2006-08-15 09:38:18+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.113.1.8

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2006-08-15 09:38:18+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.78.1.7

# 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/51-jonas/RESYNC

--- 1.118/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-08-15 09:38:25 +02:00
+++ 1.119/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-08-15 09:38:25 +02:00
@@ -3831,6 +3831,7 @@
   } 
   else if (activeCreat == Fragrecord::AC_NR_COPY)
   {
+    regTcPtr->totSendlenAi = regTcPtr->totReclenAi;
     handle_nr_copy(signal, tcConnectptr);
   }
   else
@@ -3845,7 +3846,8 @@
     signal->theData[0] = regTcPtr->tupConnectrec;
     EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);
     jamEntry();
-    
+
+    regTcPtr->totSendlenAi = regTcPtr->totReclenAi;
     packLqhkeyreqLab(signal);
   }
 }
@@ -7180,7 +7182,6 @@
   signal->theData[0] = regTcPtr->tupConnectrec;
   EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);
   
-  regTcPtr->totSendlenAi = regTcPtr->totReclenAi;
   continueAbortLab(signal);
   return;
 }//Dblqh::execACC_ABORTCONF()
Thread
bk commit into 5.1 tree (jonas:1.2260)jonas15 Aug