From: Date: June 25 2008 2:49pm
Subject: bzr commit into mysql-5.1-telco-6.2 branch (jonas:2630) Bug#37628
List-Archive: http://lists.mysql.com/commits/48480
X-Bug: 37628
Message-Id: <20080625124918.D975F714DB2@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/jonas/src/telco-6.2/

 2630 jonas@stripped	2008-06-25
      ndb - bug#37628
        Fix variable scoping (remove duplicate variable start_gci)
        in complete_out_of_order_buckets
        also correct a printout in same function
modified:
  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

per-file comments:
  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    ndb - bug#37628
      Fix variable scoping (remove duplicate variable start_gci)
      in complete_out_of_order_buckets
      also correct a printout in same function
=== modified file 'storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-06-16 12:34:47 +0000
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-06-25 12:49:13 +0000
@@ -1957,14 +1957,14 @@ NdbEventBuffer::complete_outof_order_gci
   Uint64 stop_gci = m_latest_complete_GCI;
 
   Uint64 start_gci = array[minpos];
-  g_eventLogger->info("complete_outof_order_gcis from: %u/%u to: %u/%u",
-                      Uint32(start_gci >> 32), Uint32(start_gci),
-                      Uint32(stop_gci >> 32), Uint32(stop_gci));
+  g_eventLogger->info("complete_outof_order_gcis from: %u/%u(%u) to: %u/%u(%u)",
+                      Uint32(start_gci >> 32), Uint32(start_gci), minpos,
+                      Uint32(stop_gci >> 32), Uint32(stop_gci), maxpos);
 
   assert(start_gci <= stop_gci);
   do
   {
-    Uint64 start_gci = array[minpos];
+    start_gci = array[minpos];
     Gci_container* bucket = find_bucket(start_gci);
     assert(bucket);
     assert(maxpos == m_max_gci_index);
@@ -1978,10 +1978,10 @@ NdbEventBuffer::complete_outof_order_gci
 
 #ifdef VM_TRACE
     ndbout_c("complete_outof_order_gcis - completing %u/%u rows: %u",
-             Uint32(start_gci), Uint32(start_gci), bucket->m_data.m_count);
+             Uint32(start_gci >> 32), Uint32(start_gci), bucket->m_data.m_count);
 #else
     ndbout_c("complete_outof_order_gcis - completing %u/%u",
-             Uint32(start_gci), Uint32(start_gci));
+             Uint32(start_gci >> 32), Uint32(start_gci));
 #endif
     
     complete_bucket(bucket);