MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:May 30 2006 11:55am
Subject:bk commit into 5.1 tree (tomas:1.2173) BUG#20142
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
  1.2173 06/05/30 13:55:25 tomas@stripped +3 -0
  Bug #20142 show engine ndb status may falsely return latest epoch == 0

  storage/ndb/src/ndbapi/Ndbif.cpp
    1.41 06/05/30 13:55:17 tomas@stripped +0 -4
    Bug #20142 show engine ndb status may falsely return latest epoch == 0

  storage/ndb/src/ndbapi/NdbTransaction.cpp
    1.57 06/05/30 13:55:17 tomas@stripped +9 -0
    Bug #20142 show engine ndb status may falsely return latest epoch == 0

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.134 06/05/30 13:55:17 tomas@stripped +0 -2
    Bug #20142 show engine ndb status may falsely return latest epoch == 0

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.56/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-04-19 17:09:34 +02:00
+++ 1.57/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-05-30 13:55:17 +02:00
@@ -32,6 +32,8 @@
 #include <signaldata/TcKeyFailConf.hpp>
 #include <signaldata/TcHbRep.hpp>
 
+Uint64 g_latest_trans_gci = 0;
+
 /*****************************************************************************
 NdbTransaction( Ndb* aNdb );
 
@@ -1568,6 +1570,9 @@
     theCommitStatus = Committed;
     theCompletionStatus = CompletedSuccess;
     theGlobalCheckpointId = commitConf->gci;
+    // theGlobalCheckpointId == 0 if NoOp transaction
+    if (theGlobalCheckpointId)
+      g_latest_trans_gci = theGlobalCheckpointId;
     return 0;
   } else {
 #ifdef NDB_NO_DROPPED_SIGNAL
@@ -1746,6 +1751,8 @@
     if (tCommitFlag == 1) {
       theCommitStatus = Committed;
       theGlobalCheckpointId = tGCI;
+      assert(tGCI);
+      g_latest_trans_gci = tGCI;
     } else if ((tNoComp >= tNoSent) &&
                (theLastExecOpInList->theCommitIndicator == 1)){
 
@@ -1922,6 +1929,8 @@
     if (tCommitFlag == 1) {
       theCommitStatus = Committed;
       theGlobalCheckpointId = tGCI;
+      assert(tGCI);
+      g_latest_trans_gci = tGCI;
     } else if ((tNoComp >= tNoSent) &&
                (theLastExecOpInList->theCommitIndicator == 1)){
       /**********************************************************************/

--- 1.133/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-19 16:17:35 +02:00
+++ 1.134/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-30 13:55:17 +02:00
@@ -56,7 +56,6 @@
    DBUG_RETURN(b);\
 }
 
-extern Uint64 g_latest_trans_gci;
 int ndb_dictionary_is_mysqld = 0;
 
 bool
@@ -4226,7 +4225,6 @@
 {
   const WaitGCPConf * const conf=
     CAST_CONSTPTR(WaitGCPConf, signal->getDataPtr());
-  g_latest_trans_gci= conf->gcp;
   m_waiter.signal(NO_WAIT);
 }
 

--- 1.40/storage/ndb/src/ndbapi/Ndbif.cpp	2006-04-18 14:53:28 +02:00
+++ 1.41/storage/ndb/src/ndbapi/Ndbif.cpp	2006-05-30 13:55:17 +02:00
@@ -46,7 +46,6 @@
 
 #include <EventLogger.hpp>
 extern EventLogger g_eventLogger;
-Uint64 g_latest_trans_gci= 0;
 
 /******************************************************************************
  * int init( int aNrOfCon, int aNrOfOp );
@@ -367,7 +366,6 @@
       tCon = void2con(tFirstDataPtr);
       if ((tCon->checkMagicNumber() == 0) &&
           (tCon->theSendStatus == NdbTransaction::sendTC_OP)) {
-	g_latest_trans_gci= keyConf->gci;
         tReturnCode = tCon->receiveTCKEYCONF(keyConf, tLen);
         if (tReturnCode != -1) {
           completedTransaction(tCon);
@@ -520,7 +518,6 @@
       tCon = void2con(tFirstDataPtr);
       if ((tCon->checkMagicNumber() == 0) &&
 	  (tCon->theSendStatus == NdbTransaction::sendTC_COMMIT)) {
-	g_latest_trans_gci= commitConf->gci;
 	tReturnCode = tCon->receiveTC_COMMITCONF(commitConf);
 	if (tReturnCode != -1) {
 	  completedTransaction(tCon);
@@ -855,7 +852,6 @@
     tCon = void2con(tFirstDataPtr);
     if ((tCon->checkMagicNumber() == 0) &&
 	(tCon->theSendStatus == NdbTransaction::sendTC_OP)) {
-      g_latest_trans_gci= indxConf->gci;
       tReturnCode = tCon->receiveTCINDXCONF(indxConf, tLen);
       if (tReturnCode != -1) { 
 	completedTransaction(tCon);
Thread
bk commit into 5.1 tree (tomas:1.2173) BUG#20142tomas30 May