Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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-12-18 15:16:45+01:00, pekka@stripped +2 -0
ndb - wl#3600
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-12-18 15:15:43+01:00, pekka@stripped +49 -49
wl#3600 rename SchemaOp to SchemaOperation to make room for new SchemaOp
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@stripped, 2006-12-18 15:15:44+01:00, pekka@stripped +35 -35
wl#3600 rename SchemaOp to SchemaOperation to make room for new SchemaOp
# 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: pekka
# Host: clam.(none)
# Root: /export/space/pekka/ndb/version/my52-wl3600
--- 1.111/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-12-08 22:18:55 +01:00
+++ 1.112/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-12-18 15:15:43 +01:00
@@ -113,14 +113,14 @@
void (Dbdict::* m_trans_abort_start)(Signal*, Dbdict::SchemaTransaction*);
void (Dbdict::* m_trans_abort_complete)(Signal*, Dbdict::SchemaTransaction*);
- void (Dbdict::* m_prepare_start)(Signal*, Dbdict::SchemaOp*);
- void (Dbdict::* m_prepare_complete)(Signal*, Dbdict::SchemaOp*);
- void (Dbdict::* m_commit)(Signal*, Dbdict::SchemaOp*);
- void (Dbdict::* m_commit_start)(Signal*, Dbdict::SchemaOp*);
- void (Dbdict::* m_commit_complete)(Signal*, Dbdict::SchemaOp*);
- void (Dbdict::* m_abort)(Signal*, Dbdict::SchemaOp*);
- void (Dbdict::* m_abort_start)(Signal*, Dbdict::SchemaOp*);
- void (Dbdict::* m_abort_complete)(Signal*, Dbdict::SchemaOp*);
+ void (Dbdict::* m_prepare_start)(Signal*, Dbdict::SchemaOperation*);
+ void (Dbdict::* m_prepare_complete)(Signal*, Dbdict::SchemaOperation*);
+ void (Dbdict::* m_commit)(Signal*, Dbdict::SchemaOperation*);
+ void (Dbdict::* m_commit_start)(Signal*, Dbdict::SchemaOperation*);
+ void (Dbdict::* m_commit_complete)(Signal*, Dbdict::SchemaOperation*);
+ void (Dbdict::* m_abort)(Signal*, Dbdict::SchemaOperation*);
+ void (Dbdict::* m_abort_start)(Signal*, Dbdict::SchemaOperation*);
+ void (Dbdict::* m_abort_complete)(Signal*, Dbdict::SchemaOperation*);
} f_dict_op[] = {
/**
@@ -1519,10 +1519,10 @@
c_opCreateTrigger(c_opRecordPool),
c_opDropTrigger(c_opRecordPool),
c_opAlterTrigger(c_opRecordPool),
- c_schemaOp(c_opRecordPool),
+ c_schemaOperation(c_opRecordPool),
c_Trans(c_opRecordPool),
- c_opCreateObj(c_schemaOp),
- c_opDropObj(c_schemaOp),
+ c_opCreateObj(c_schemaOperation),
+ c_opDropObj(c_schemaOperation),
c_opRecordSequence(0),
c_dictLockQueue(c_dictLockPool),
c_dictLockPoll(false)
@@ -2100,7 +2100,7 @@
(SchemaFile*)c_schemaPageRecordArray.getPtr(1 * NDB_SF_MAX_PAGES);
c_schemaFile[1].noOfPages = 0;
- c_schemaOp.setSize(8);
+ c_schemaOperation.setSize(8);
//c_opDropObj.setSize(8);
c_Trans.setSize(8);
@@ -14427,7 +14427,7 @@
trans_ptr.p->setErrorCode(ref->errorCode);
}
Uint32 node = refToNode(ref->senderRef);
- schemaOp_reply(signal, trans_ptr.p, node);
+ schemaOperation_reply(signal, trans_ptr.p, node);
}
void
@@ -14438,11 +14438,11 @@
Ptr<SchemaTransaction> trans_ptr;
ndbrequire(c_Trans.find(trans_ptr, conf->senderData));
- schemaOp_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
+ schemaOperation_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
}
void
-Dbdict::schemaOp_reply(Signal* signal,
+Dbdict::schemaOperation_reply(Signal* signal,
SchemaTransaction * trans_ptr_p,
Uint32 nodeId)
{
@@ -14813,8 +14813,8 @@
{
DictCommitReq* req = (DictCommitReq*)signal->getDataPtr();
- Ptr<SchemaOp> op;
- ndbrequire(c_schemaOp.find(op, req->op_key));
+ Ptr<SchemaOperation> op;
+ ndbrequire(c_schemaOperation.find(op, req->op_key));
(this->*f_dict_op[op.p->m_vt_index].m_commit)(signal, op.p);
}
@@ -14824,8 +14824,8 @@
{
DictAbortReq* req = (DictAbortReq*)signal->getDataPtr();
- Ptr<SchemaOp> op;
- ndbrequire(c_schemaOp.find(op, req->op_key));
+ Ptr<SchemaOperation> op;
+ ndbrequire(c_schemaOperation.find(op, req->op_key));
(this->*f_dict_op[op.p->m_vt_index].m_abort)(signal, op.p);
}
@@ -14843,7 +14843,7 @@
trans_ptr.p->setErrorCode(ref->errorCode);
}
Uint32 node = refToNode(ref->senderRef);
- schemaOp_reply(signal, trans_ptr.p, node);
+ schemaOperation_reply(signal, trans_ptr.p, node);
}
void
@@ -14854,7 +14854,7 @@
Ptr<SchemaTransaction> trans_ptr;
ndbrequire(c_Trans.find(trans_ptr, conf->senderData));
- schemaOp_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
+ schemaOperation_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
}
void
@@ -14870,7 +14870,7 @@
trans_ptr.p->setErrorCode(ref->errorCode);
}
Uint32 node = refToNode(ref->senderRef);
- schemaOp_reply(signal, trans_ptr.p, node);
+ schemaOperation_reply(signal, trans_ptr.p, node);
}
void
@@ -14881,7 +14881,7 @@
Ptr<SchemaTransaction> trans_ptr;
ndbrequire(c_Trans.find(trans_ptr, conf->senderData));
- schemaOp_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
+ schemaOperation_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
}
@@ -15001,7 +15001,7 @@
}
void
-Dbdict::createObj_commit(Signal * signal, SchemaOp * op){
+Dbdict::createObj_commit(Signal * signal, SchemaOperation * op){
jam();
OpCreateObj * createObj = (OpCreateObj*)op;
@@ -15080,7 +15080,7 @@
}
void
-Dbdict::createObj_abort(Signal* signal, SchemaOp* op)
+Dbdict::createObj_abort(Signal* signal, SchemaOperation* op)
{
jam();
@@ -15305,7 +15305,7 @@
}
void
-Dbdict::dropObj_commit(Signal * signal, SchemaOp * op){
+Dbdict::dropObj_commit(Signal * signal, SchemaOperation * op){
jam();
OpDropObj * dropObj = (OpDropObj*)op;
@@ -15383,7 +15383,7 @@
}
void
-Dbdict::dropObj_abort(Signal * signal, SchemaOp * op){
+Dbdict::dropObj_abort(Signal * signal, SchemaOperation * op){
jam();
OpDropObj * dropObj = (OpDropObj*)op;
@@ -15468,7 +15468,7 @@
}
void
-Dbdict::create_fg_prepare_start(Signal* signal, SchemaOp* op){
+Dbdict::create_fg_prepare_start(Signal* signal, SchemaOperation* op){
/**
* Put data into table record
*/
@@ -15602,7 +15602,7 @@
}
void
-Dbdict::create_fg_prepare_complete(Signal* signal, SchemaOp* op){
+Dbdict::create_fg_prepare_complete(Signal* signal, SchemaOperation* op){
/**
* CONTACT TSMAN LGMAN PGMAN
*/
@@ -15667,7 +15667,7 @@
}
void
-Dbdict::create_fg_abort_start(Signal* signal, SchemaOp* op){
+Dbdict::create_fg_abort_start(Signal* signal, SchemaOperation* op){
CreateFilegroupImplReq* req =
(CreateFilegroupImplReq*)signal->getDataPtrSend();
@@ -15682,7 +15682,7 @@
}
void
-Dbdict::create_fg_abort_complete(Signal* signal, SchemaOp* op){
+Dbdict::create_fg_abort_complete(Signal* signal, SchemaOperation* op){
if (op->m_obj_ptr_i != RNIL)
{
@@ -15698,7 +15698,7 @@
}
void
-Dbdict::create_file_prepare_start(Signal* signal, SchemaOp* op){
+Dbdict::create_file_prepare_start(Signal* signal, SchemaOperation* op){
/**
* Put data into table record
*/
@@ -15844,7 +15844,7 @@
void
-Dbdict::create_file_prepare_complete(Signal* signal, SchemaOp* op){
+Dbdict::create_file_prepare_complete(Signal* signal, SchemaOperation* op){
/**
* CONTACT TSMAN LGMAN PGMAN
*/
@@ -15928,7 +15928,7 @@
}
void
-Dbdict::create_file_commit_start(Signal* signal, SchemaOp* op){
+Dbdict::create_file_commit_start(Signal* signal, SchemaOperation* op){
/**
* CONTACT TSMAN LGMAN PGMAN
*/
@@ -15965,7 +15965,7 @@
}
void
-Dbdict::create_file_abort_start(Signal* signal, SchemaOp* op)
+Dbdict::create_file_abort_start(Signal* signal, SchemaOperation* op)
{
CreateFileImplReq* req = (CreateFileImplReq*)signal->getDataPtrSend();
@@ -16006,7 +16006,7 @@
}
void
-Dbdict::create_file_abort_complete(Signal* signal, SchemaOp* op)
+Dbdict::create_file_abort_complete(Signal* signal, SchemaOperation* op)
{
if (op->m_obj_ptr_i != RNIL)
{
@@ -16038,26 +16038,26 @@
}
void
-Dbdict::drop_file_prepare_start(Signal* signal, SchemaOp* op)
+Dbdict::drop_file_prepare_start(Signal* signal, SchemaOperation* op)
{
send_drop_file(signal, op, DropFileImplReq::Prepare);
}
void
-Dbdict::drop_undofile_prepare_start(Signal* signal, SchemaOp* op)
+Dbdict::drop_undofile_prepare_start(Signal* signal, SchemaOperation* op)
{
op->m_errorCode = DropFileRef::DropUndoFileNotSupported;
execute(signal, op->m_callback, 0);
}
void
-Dbdict::drop_file_commit_start(Signal* signal, SchemaOp* op)
+Dbdict::drop_file_commit_start(Signal* signal, SchemaOperation* op)
{
send_drop_file(signal, op, DropFileImplReq::Commit);
}
void
-Dbdict::drop_file_commit_complete(Signal* signal, SchemaOp* op)
+Dbdict::drop_file_commit_complete(Signal* signal, SchemaOperation* op)
{
FilePtr f_ptr;
c_file_pool.getPtr(f_ptr, op->m_obj_ptr_i);
@@ -16073,13 +16073,13 @@
}
void
-Dbdict::drop_file_abort_start(Signal* signal, SchemaOp* op)
+Dbdict::drop_file_abort_start(Signal* signal, SchemaOperation* op)
{
send_drop_file(signal, op, DropFileImplReq::Abort);
}
void
-Dbdict::send_drop_file(Signal* signal, SchemaOp* op,
+Dbdict::send_drop_file(Signal* signal, SchemaOperation* op,
DropFileImplReq::RequestInfo type)
{
DropFileImplReq* req = (DropFileImplReq*)signal->getDataPtrSend();
@@ -16127,7 +16127,7 @@
trans_ptr.p->setErrorCode(ref->errorCode);
}
Uint32 node = refToNode(ref->senderRef);
- schemaOp_reply(signal, trans_ptr.p, node);
+ schemaOperation_reply(signal, trans_ptr.p, node);
}
void
@@ -16138,7 +16138,7 @@
Ptr<SchemaTransaction> trans_ptr;
ndbrequire(c_Trans.find(trans_ptr, conf->senderData));
- schemaOp_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
+ schemaOperation_reply(signal, trans_ptr.p, refToNode(conf->senderRef));
}
void
@@ -16194,7 +16194,7 @@
}
void
-Dbdict::drop_fg_prepare_start(Signal* signal, SchemaOp* op)
+Dbdict::drop_fg_prepare_start(Signal* signal, SchemaOperation* op)
{
FilegroupPtr fg_ptr;
c_filegroup_pool.getPtr(fg_ptr, op->m_obj_ptr_i);
@@ -16212,7 +16212,7 @@
}
void
-Dbdict::drop_fg_commit_start(Signal* signal, SchemaOp* op)
+Dbdict::drop_fg_commit_start(Signal* signal, SchemaOperation* op)
{
FilegroupPtr fg_ptr;
c_filegroup_pool.getPtr(fg_ptr, op->m_obj_ptr_i);
@@ -16250,7 +16250,7 @@
}
void
-Dbdict::drop_fg_commit_complete(Signal* signal, SchemaOp* op)
+Dbdict::drop_fg_commit_complete(Signal* signal, SchemaOperation* op)
{
FilegroupPtr fg_ptr;
c_filegroup_pool.getPtr(fg_ptr, op->m_obj_ptr_i);
@@ -16262,13 +16262,13 @@
}
void
-Dbdict::drop_fg_abort_start(Signal* signal, SchemaOp* op)
+Dbdict::drop_fg_abort_start(Signal* signal, SchemaOperation* op)
{
send_drop_fg(signal, op, DropFilegroupImplReq::Abort);
}
void
-Dbdict::send_drop_fg(Signal* signal, SchemaOp* op,
+Dbdict::send_drop_fg(Signal* signal, SchemaOperation* op,
DropFilegroupImplReq::RequestInfo type)
{
DropFilegroupImplReq* req = (DropFilegroupImplReq*)signal->getDataPtrSend();
--- 1.44/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2006-12-01 14:04:04 +01:00
+++ 1.45/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2006-12-18 15:15:44 +01:00
@@ -1940,7 +1940,7 @@
typedef Ptr<OpAlterTrigger> OpAlterTriggerPtr;
public:
- struct SchemaOp : OpRecordCommon {
+ struct SchemaOperation : OpRecordCommon {
Uint32 m_clientRef; // API (for take-over)
Uint32 m_clientData;// API
@@ -1957,7 +1957,7 @@
Uint32 m_vt_index;
Callback m_callback;
};
- typedef Ptr<SchemaOp> SchemaOpPtr;
+ typedef Ptr<SchemaOperation> SchemaOperationPtr;
struct SchemaTransaction : OpRecordCommon {
Uint32 m_senderRef; // API
@@ -1982,14 +1982,14 @@
};
private:
- struct OpCreateObj : public SchemaOp {
+ struct OpCreateObj : public SchemaOperation {
Uint32 m_gci;
Uint32 m_obj_info_ptr_i;
Uint32 m_restart;
};
typedef Ptr<OpCreateObj> CreateObjRecordPtr;
- struct OpDropObj : public SchemaOp
+ struct OpDropObj : public SchemaOperation
{
};
typedef Ptr<OpDropObj> DropObjRecordPtr;
@@ -2048,10 +2048,10 @@
KeyTable2<OpCreateTrigger, OpRecordUnion> c_opCreateTrigger;
KeyTable2<OpDropTrigger, OpRecordUnion> c_opDropTrigger;
KeyTable2<OpAlterTrigger, OpRecordUnion> c_opAlterTrigger;
- KeyTable2<SchemaOp, OpRecordUnion> c_schemaOp;
+ KeyTable2<SchemaOperation, OpRecordUnion> c_schemaOperation;
KeyTable2<SchemaTransaction, OpRecordUnion> c_Trans;
- KeyTable2Ref<OpCreateObj, SchemaOp, OpRecordUnion> c_opCreateObj;
- KeyTable2Ref<OpDropObj, SchemaOp, OpRecordUnion> c_opDropObj;
+ KeyTable2Ref<OpCreateObj, SchemaOperation, OpRecordUnion> c_opCreateObj;
+ KeyTable2Ref<OpDropObj, SchemaOperation, OpRecordUnion> c_opDropObj;
// Unique key for operation XXX move to some system table
Uint32 c_opRecordSequence;
@@ -2572,7 +2572,7 @@
void createObj_abort_writeSchemaConf(Signal*, Uint32 callbackData, Uint32);
void createObj_abort_complete_done(Signal*, Uint32 callbackData, Uint32);
- void schemaOp_reply(Signal* signal, SchemaTransaction *, Uint32);
+ void schemaOperation_reply(Signal* signal, SchemaTransaction *, Uint32);
void trans_commit_start_done(Signal*, Uint32 callbackData, Uint32);
void trans_commit_complete_done(Signal*, Uint32 callbackData, Uint32);
void trans_abort_start_done(Signal*, Uint32 callbackData, Uint32);
@@ -2612,35 +2612,35 @@
void execDICT_ABORT_CONF(Signal*);
public:
- void createObj_commit(Signal*, struct SchemaOp*);
- void createObj_abort(Signal*, struct SchemaOp*);
+ void createObj_commit(Signal*, struct SchemaOperation*);
+ void createObj_abort(Signal*, struct SchemaOperation*);
- void create_fg_prepare_start(Signal* signal, SchemaOp*);
- void create_fg_prepare_complete(Signal* signal, SchemaOp*);
- void create_fg_abort_start(Signal* signal, SchemaOp*);
- void create_fg_abort_complete(Signal* signal, SchemaOp*);
-
- void create_file_prepare_start(Signal* signal, SchemaOp*);
- void create_file_prepare_complete(Signal* signal, SchemaOp*);
- void create_file_commit_start(Signal* signal, SchemaOp*);
- void create_file_abort_start(Signal* signal, SchemaOp*);
- void create_file_abort_complete(Signal* signal, SchemaOp*);
-
- void dropObj_commit(Signal*, struct SchemaOp*);
- void dropObj_abort(Signal*, struct SchemaOp*);
- void drop_file_prepare_start(Signal* signal, SchemaOp*);
- void drop_file_commit_start(Signal* signal, SchemaOp*);
- void drop_file_commit_complete(Signal* signal, SchemaOp*);
- void drop_file_abort_start(Signal* signal, SchemaOp*);
- void send_drop_file(Signal*, SchemaOp*, DropFileImplReq::RequestInfo);
-
- void drop_fg_prepare_start(Signal* signal, SchemaOp*);
- void drop_fg_commit_start(Signal* signal, SchemaOp*);
- void drop_fg_commit_complete(Signal* signal, SchemaOp*);
- void drop_fg_abort_start(Signal* signal, SchemaOp*);
- void send_drop_fg(Signal*, SchemaOp*, DropFilegroupImplReq::RequestInfo);
+ void create_fg_prepare_start(Signal* signal, SchemaOperation*);
+ void create_fg_prepare_complete(Signal* signal, SchemaOperation*);
+ void create_fg_abort_start(Signal* signal, SchemaOperation*);
+ void create_fg_abort_complete(Signal* signal, SchemaOperation*);
+
+ void create_file_prepare_start(Signal* signal, SchemaOperation*);
+ void create_file_prepare_complete(Signal* signal, SchemaOperation*);
+ void create_file_commit_start(Signal* signal, SchemaOperation*);
+ void create_file_abort_start(Signal* signal, SchemaOperation*);
+ void create_file_abort_complete(Signal* signal, SchemaOperation*);
+
+ void dropObj_commit(Signal*, struct SchemaOperation*);
+ void dropObj_abort(Signal*, struct SchemaOperation*);
+ void drop_file_prepare_start(Signal* signal, SchemaOperation*);
+ void drop_file_commit_start(Signal* signal, SchemaOperation*);
+ void drop_file_commit_complete(Signal* signal, SchemaOperation*);
+ void drop_file_abort_start(Signal* signal, SchemaOperation*);
+ void send_drop_file(Signal*, SchemaOperation*, DropFileImplReq::RequestInfo);
+
+ void drop_fg_prepare_start(Signal* signal, SchemaOperation*);
+ void drop_fg_commit_start(Signal* signal, SchemaOperation*);
+ void drop_fg_commit_complete(Signal* signal, SchemaOperation*);
+ void drop_fg_abort_start(Signal* signal, SchemaOperation*);
+ void send_drop_fg(Signal*, SchemaOperation*, DropFilegroupImplReq::RequestInfo);
- void drop_undofile_prepare_start(Signal* signal, SchemaOp*);
+ void drop_undofile_prepare_start(Signal* signal, SchemaOperation*);
};
inline bool
| Thread |
|---|
| • bk commit into 5.1 tree (pekka:1.2368) | pekka | 18 Dec |
