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, 2008-02-19 10:59:00+01:00, tomas@stripped +2 -0
corrected some epoch printouts
storage/ndb/src/common/debugger/EventLogger.cpp@stripped, 2008-02-19 10:58:57+01:00, tomas@stripped +8 -8
corrected some epoch printouts
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2008-02-19 10:58:57+01:00, tomas@stripped +5 -5
corrected some epoch printouts
diff -Nrup a/storage/ndb/src/common/debugger/EventLogger.cpp b/storage/ndb/src/common/debugger/EventLogger.cpp
--- a/storage/ndb/src/common/debugger/EventLogger.cpp 2008-02-13 11:39:47 +01:00
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp 2008-02-19 10:58:57 +01:00
@@ -759,14 +759,14 @@ void getTextEventBufferStatus(QQQQ) {
convert_unit(max_, max_unit);
BaseString::snprintf(m_text, m_text_len,
"Event buffer status: used=%d%s(%d%) alloc=%d%s(%d%) "
- "max=%d%s apply_gci=%lld latest_gci=%lld",
+ "max=%d%s apply_epoch=%u/%u latest_epoch=%u/%u",
used, used_unit,
theData[2] ? (Uint32)((((Uint64)theData[1])*100)/theData[2]) : 0,
alloc, alloc_unit,
theData[3] ? (Uint32)((((Uint64)theData[2])*100)/theData[3]) : 0,
max_, max_unit,
- theData[4]+(((Uint64)theData[5])<<32),
- theData[6]+(((Uint64)theData[7])<<32));
+ theData[5], theData[4],
+ theData[7], theData[6]);
}
void getTextWarningEvent(QQQQ) {
BaseString::snprintf(m_text, m_text_len, (char *)&theData[1]);
@@ -996,18 +996,18 @@ void getTextSubscriptionStatus(QQQQ)
case(1): // SubscriptionStatus::DISCONNECTED
BaseString::snprintf(m_text, m_text_len,
"Disconnecting node %u because it has "
- "exceeded MaxBufferedEpochs (%llu > %u), gci %llu",
+ "exceeded MaxBufferedEpochs (%u/%u > %u), epoch %u/%u",
theData[2],
- make_uint64(theData[5], theData[6]),
+ theData[6], theData[5],
theData[7],
- make_uint64(theData[3], theData[4]));
+ theData[4], theData[3]);
break;
case(2): // SubscriptionStatus::INCONSISTENT
BaseString::snprintf(m_text, m_text_len,
"Nodefailure while out of event buffer: "
"informing subscribers of possibly missing event data"
- ", gci %lld",
- make_uint64(theData[3], theData[4]));
+ ", epoch %u/%u",
+ theData[4], theData[3]);
break;
}
}
diff -Nrup a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2008-02-13 11:39:47 +01:00
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2008-02-19 10:58:57 +01:00
@@ -52,7 +52,7 @@ static Gci_container_pod g_empty_gci_con
static void
print_std(const SubTableData * sdata, LinearSectionPtr ptr[3])
{
- printf("addr=%p gci{hi/lo}hi=%d/%d op=%d\n", (void*)sdata,
+ printf("addr=%p gci{hi/lo}hi=%u/%u op=%d\n", (void*)sdata,
sdata->gci_hi, sdata->gci_lo,
SubTableData::getOperation(sdata->requestInfo));
for (int i = 0; i <= 2; i++) {
@@ -2468,8 +2468,8 @@ NdbEventBuffer::alloc_data()
{
#ifdef VM_TRACE
printf("m_latest_command: %s\n", m_latest_command);
- printf("no free data, m_latestGCI %lld\n",
- m_latestGCI);
+ printf("no free data, m_latestGCI %u/%u\n",
+ (Uint32)(m_latestGCI << 32), (Uint32)m_latestGCI);
printf("m_free_data_count %d\n", m_free_data_count);
printf("m_available_data_count %d first gci{hi/lo} %u/%u last gci{hi/lo} %u/%u\n",
m_available_data.m_count,
@@ -3106,8 +3106,8 @@ void
EventBufData_list::move_gci_ops(EventBufData_list *list, Uint64 gci)
{
DBUG_ENTER_EVENT("EventBufData_list::move_gci_ops");
- DBUG_PRINT_EVENT("info", ("this: %p list: %p gci: %llu",
- this, list, gci));
+ DBUG_PRINT_EVENT("info", ("this: %p list: %p gci: %u/%u",
+ this, list, (Uint32)(gci >> 32), (Uint32)gci));
assert(!m_is_not_multi_list);
if (!list->m_is_not_multi_list)
{
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2531) | tomas | 20 Feb |
