Bug #20142 show engine ndb status may falsely return latest epoch == 0

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -56,7 +56,6 @@
    DBUG_RETURN(b);\
 }
 
-extern Uint64 g_latest_trans_gci;
 int ndb_dictionary_is_mysqld = 0;
 
 bool
@@ -4226,7 +4225,6 @@ NdbDictInterface::execWAIT_GCP_CONF(NdbApiSignal* signal,
 {
   const WaitGCPConf * const conf=
     CAST_CONSTPTR(WaitGCPConf, signal->getDataPtr());
-  g_latest_trans_gci= conf->gcp;
   m_waiter.signal(NO_WAIT);
 }
 

storage/ndb/src/ndbapi/NdbTransaction.cpp

@@ -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 @@ NdbTransaction::receiveTC_COMMITCONF(const TcCommitConf * commitConf)
     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 @@ from other transactions.
     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 @@ NdbTransaction::receiveTCINDXCONF(const TcIndxConf * indxConf,
     if (tCommitFlag == 1) {
       theCommitStatus = Committed;
       theGlobalCheckpointId = tGCI;
+      assert(tGCI);
+      g_latest_trans_gci = tGCI;
     } else if ((tNoComp >= tNoSent) &&
                (theLastExecOpInList->theCommitIndicator == 1)){
       /**********************************************************************/

storage/ndb/src/ndbapi/Ndbif.cpp

@@ -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 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
       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 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
       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 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
     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);