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-11-06 15:09:58+01:00, jonas@stripped +2 -0
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
MERGE: 1.1810.2123.22
storage/ndb/src/common/util/socket_io.cpp@stripped, 2006-11-06 15:09:56+01:00, jonas@stripped +1 -8
merge
MERGE: 1.7.4.2
storage/ndb/src/common/util/socket_io.cpp@stripped, 2006-11-06 15:06:04+01:00, jonas@stripped +0 -0
Merge rename: ndb/src/common/util/socket_io.cpp -> storage/ndb/src/common/util/socket_io.cpp
storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-11-06 15:06:04+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.43.13.2
storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-11-06 15:06:04+01:00, jonas@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbTransaction.cpp -> storage/ndb/src/ndbapi/NdbTransaction.cpp
# 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-work/RESYNC
--- 1.7.4.1/ndb/src/common/util/socket_io.cpp 2006-11-06 15:10:02 +01:00
+++ 1.12/storage/ndb/src/common/util/socket_io.cpp 2006-11-06 15:10:02 +01:00
@@ -49,7 +49,7 @@
extern "C"
int
readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
- char * buf, int buflen){
+ char * buf, int buflen, NdbMutex *mutex){
if(buflen <= 1)
return 0;
@@ -61,7 +61,12 @@
timeout.tv_sec = (timeout_millis / 1000);
timeout.tv_usec = (timeout_millis % 1000) * 1000;
+ if(mutex)
+ NdbMutex_Unlock(mutex);
const int selectRes = select(socket + 1, &readset, 0, 0, &timeout);
+ if(mutex)
+ NdbMutex_Lock(mutex);
+
if(selectRes == 0){
return 0;
}
--- 1.43.13.1/ndb/src/ndbapi/NdbTransaction.cpp 2006-11-06 15:10:02 +01:00
+++ 1.63/storage/ndb/src/ndbapi/NdbTransaction.cpp 2006-11-06 15:10:02 +01:00
@@ -62,6 +62,7 @@
theTCConPtr(0),
theTransactionId(0),
theGlobalCheckpointId(0),
+ p_latest_trans_gci(0),
theStatus(NotConnected),
theCompletionStatus(NotCompleted),
theCommitStatus(NotStarted),
@@ -127,6 +128,8 @@
theCompletedLastOp = NULL;
theGlobalCheckpointId = 0;
+ p_latest_trans_gci =
+ theNdb->theImpl->m_ndb_cluster_connection.get_latest_trans_gci();
theCommitStatus = Started;
theCompletionStatus = NotCompleted;
m_abortOption = AbortOnError;
@@ -463,7 +466,7 @@
//------------------------------------------------------------------------
Ndb* tNdb = theNdb;
- Uint32 timeout = TransporterFacade::instance()->m_waitfor_timeout;
+ Uint32 timeout = theNdb->theImpl->m_transporter_facade->m_waitfor_timeout;
m_waitForReply = false;
executeAsynchPrepare(aTypeOfExec, NULL, NULL, abortOption);
if (m_waitForReply){
@@ -735,7 +738,7 @@
tcHbRep->transId1 = tTransId1;
tcHbRep->transId2 = tTransId2;
- TransporterFacade *tp = TransporterFacade::instance();
+ TransporterFacade *tp = theNdb->theImpl->m_transporter_facade;
tp->lock_mutex();
const int res = tp->sendSignal(tSignal,theDBnode);
tp->unlock_mutex();
@@ -841,7 +844,7 @@
*************************************************************************/
NdbApiSignal tSignal(tNdb->theMyRef);
Uint32 tTransId1, tTransId2;
- TransporterFacade *tp = TransporterFacade::instance();
+ TransporterFacade *tp = theNdb->theImpl->m_transporter_facade;
int tReturnCode;
tTransId1 = (Uint32) theTransactionId;
@@ -888,7 +891,7 @@
{
NdbApiSignal tSignal(theNdb->theMyRef);
Uint32 tTransId1, tTransId2;
- TransporterFacade *tp = TransporterFacade::instance();
+ TransporterFacade *tp = theNdb->theImpl->m_transporter_facade;
int tReturnCode;
tTransId1 = (Uint32) theTransactionId;
@@ -999,7 +1002,7 @@
}//NdbTransaction::releaseScanOperations()
/*****************************************************************************
-void releaseExecutedScanOperation();
+void releaseScanOperation();
Remark: Release scan op when hupp'ed trans closed (save memory)
******************************************************************************/
@@ -1230,9 +1233,9 @@
if(tOp)
{
tOp->m_currentTable = table;
+ // Mark that this really an NdbIndexScanOperation
+ tOp->m_type = NdbOperation::OrderedIndexScan;
}
- // Mark that this really an NdbIndexScanOperation
- tOp->m_type = NdbOperation::OrderedIndexScan;
return tOp;
} else {
setOperationErrorCodeAbort(4271);
@@ -1606,6 +1609,9 @@
theCommitStatus = Committed;
theCompletionStatus = CompletedSuccess;
theGlobalCheckpointId = commitConf->gci;
+ // theGlobalCheckpointId == 0 if NoOp transaction
+ if (theGlobalCheckpointId)
+ *p_latest_trans_gci = theGlobalCheckpointId;
return 0;
} else {
#ifdef NDB_NO_DROPPED_SIGNAL
@@ -1784,6 +1790,10 @@
if (tCommitFlag == 1) {
theCommitStatus = Committed;
theGlobalCheckpointId = tGCI;
+ if (tGCI) // Read(dirty) only transaction doesnt get GCI
+ {
+ *p_latest_trans_gci = tGCI;
+ }
} else if ((tNoComp >= tNoSent) &&
(theLastExecOpInList->theCommitIndicator == 1)){
@@ -1960,6 +1970,8 @@
if (tCommitFlag == 1) {
theCommitStatus = Committed;
theGlobalCheckpointId = tGCI;
+ assert(tGCI);
+ *p_latest_trans_gci = tGCI;
} else if ((tNoComp >= tNoSent) &&
(theLastExecOpInList->theCommitIndicator == 1)){
/**********************************************************************/
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2324) | jonas | 6 Nov |
