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, 2007-04-30 12:57:12+02:00, jonas@stripped +4 -0
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/telco-6.1
MERGE: 1.2403.9.42
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-04-30 12:57:07+02:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.129.1.9
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-04-30 12:57:07+02:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.55.1.6
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@stripped, 2007-04-30 12:57:07+02:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.21.1.4
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-04-30 12:57:07+02:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.50.1.5
# 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/telco-6.1/RESYNC
--- 1.144/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-04-30 12:57:19 +02:00
+++ 1.145/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-04-30 12:57:19 +02:00
@@ -6361,6 +6361,7 @@
tupCommitReq->opPtr = sig0;
tupCommitReq->gci = regTcPtr.p->gci;
tupCommitReq->hashValue = regTcPtr.p->hashValue;
+ tupCommitReq->diskpage = RNIL;
EXECUTE_DIRECT(tup, GSN_TUP_COMMITREQ, signal,
TupCommitReq::SignalLength);
--- 1.62/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2007-04-30 12:57:19 +02:00
+++ 1.63/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2007-04-30 12:57:19 +02:00
@@ -2127,7 +2127,8 @@
#endif
void checkDetachedTriggers(KeyReqStruct *req_struct,
Operationrec* regOperPtr,
- Tablerec* regTablePtr);
+ Tablerec* regTablePtr,
+ bool disk);
void fireImmediateTriggers(KeyReqStruct *req_struct,
DLList<TupTriggerData>& triggerList,
@@ -2139,7 +2140,8 @@
void fireDetachedTriggers(KeyReqStruct *req_struct,
DLList<TupTriggerData>& triggerList,
- Operationrec* regOperPtr);
+ Operationrec* regOperPtr,
+ bool disk);
void executeTriggers(KeyReqStruct *req_struct,
DLList<TupTriggerData>& triggerList,
@@ -2147,7 +2149,8 @@
void executeTrigger(KeyReqStruct *req_struct,
TupTriggerData* trigPtr,
- Operationrec* regOperPtr);
+ Operationrec* regOperPtr,
+ bool disk = true);
bool readTriggerInfo(TupTriggerData* trigPtr,
Operationrec* regOperPtr,
@@ -2158,8 +2161,9 @@
Uint32* afterBuffer,
Uint32& noAfterWords,
Uint32* beforeBuffer,
- Uint32& noBeforeWords);
-
+ Uint32& noBeforeWords,
+ bool disk);
+
void sendTrigAttrInfo(Signal* signal,
Uint32* data,
Uint32 dataLen,
--- 1.27/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp 2007-04-30 12:57:19 +02:00
+++ 1.28/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp 2007-04-30 12:57:19 +02:00
@@ -358,6 +358,7 @@
tupCommitReq->opPtr= opPtrI;
tupCommitReq->hashValue= hash_value;
tupCommitReq->gci= gci;
+ tupCommitReq->diskpage = page_id;
regOperPtr.p->op_struct.m_load_diskpage_on_commit= 0;
regOperPtr.p->m_commit_disk_callback_page= page_id;
@@ -388,14 +389,15 @@
c_operation_pool.getPtr(regOperPtr, opPtrI);
c_lqh->get_op_info(regOperPtr.p->userpointer, &hash_value, &gci);
+ Uint32 page= regOperPtr.p->m_commit_disk_callback_page;
TupCommitReq * const tupCommitReq= (TupCommitReq *)signal->getDataPtr();
tupCommitReq->opPtr= opPtrI;
tupCommitReq->hashValue= hash_value;
tupCommitReq->gci= gci;
+ tupCommitReq->diskpage = page;
- Uint32 page= regOperPtr.p->m_commit_disk_callback_page;
ndbassert(regOperPtr.p->op_struct.m_load_diskpage_on_commit == 0);
regOperPtr.p->op_struct.m_wait_log_buffer= 0;
m_global_page_pool.getPtr(m_pgman.m_ptr, page);
@@ -480,7 +482,16 @@
req_struct.signal= signal;
req_struct.hash_value= hash_value;
req_struct.gci= gci;
+ regOperPtr.p->m_commit_disk_callback_page = tupCommitReq->diskpage;
+#ifdef VM_TRACE
+ if (tupCommitReq->diskpage == RNIL)
+ {
+ m_pgman.m_ptr.setNull();
+ req_struct.m_disk_page_ptr.setNull();
+ }
+#endif
+
ptrCheckGuard(regTabPtr, no_of_tablerec, tablerec);
PagePtr page;
@@ -628,8 +639,10 @@
/**
* Perform "real" commit
*/
+ Uint32 disk = regOperPtr.p->m_commit_disk_callback_page;
set_change_mask_info(&req_struct, regOperPtr.p);
- checkDetachedTriggers(&req_struct, regOperPtr.p, regTabPtr.p);
+ checkDetachedTriggers(&req_struct, regOperPtr.p, regTabPtr.p,
+ disk != RNIL);
if(regOperPtr.p->op_struct.op_type != ZDELETE)
{
--- 1.57/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2007-04-30 12:57:19 +02:00
+++ 1.58/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2007-04-30 12:57:19 +02:00
@@ -24,7 +24,6 @@
#include "AttributeOffset.hpp"
#include <AttributeHeader.hpp>
#include <Interpreter.hpp>
-#include <signaldata/TupCommit.hpp>
#include <signaldata/TupKey.hpp>
#include <signaldata/AttrInfo.hpp>
#include <NdbSqlUtil.hpp>
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2515) | jonas | 30 Apr |
