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, 2007-03-23 17:13:25+01:00, tomas@stripped +20 -0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
MERGE: 1.2494.2.7
mysql-test/r/rpl_ndb_log.result@stripped, 2007-03-23 17:13:19+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.17.1.1
sql/ha_ndbcluster.cc@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.408.1.12
sql/ha_ndbcluster_binlog.cc@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.104.1.1
storage/ndb/include/ndbapi/NdbDictionary.hpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.87.2.1
storage/ndb/include/util/OutputStream.hpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.13.1.2
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.112.1.9
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.45.1.6
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.47.1.8
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.131.1.13
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.41.1.11
storage/ndb/src/ndbapi/ClusterMgr.cpp@stripped, 2007-03-23 17:13:20+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.33.1.3
storage/ndb/src/ndbapi/Ndb.cpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.88.1.2
storage/ndb/src/ndbapi/NdbDictionary.cpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.67.2.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.159.1.4
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.71.2.1
storage/ndb/src/ndbapi/NdbRecAttr.cpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.33.1.5
storage/ndb/tools/restore/Restore.cpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.45.1.4
storage/ndb/tools/restore/Restore.hpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.28.1.2
storage/ndb/tools/restore/consumer_restore.cpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.41.1.2
storage/ndb/tools/restore/restore_main.cpp@stripped, 2007-03-23 17:13:21+01:00, tomas@stripped +0 -4
Auto merged
MERGE: 1.50.1.4
# 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: tomas
# Host: whalegate.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-telco/RESYNC
--- 1.89/storage/ndb/include/ndbapi/NdbDictionary.hpp 2007-02-22 15:49:30 +01:00
+++ 1.90/storage/ndb/include/ndbapi/NdbDictionary.hpp 2007-03-23 17:13:20 +01:00
@@ -577,6 +577,15 @@
*/
class Table : public Object {
public:
+ /*
+ * Single user mode specifies access rights to table during single user mode
+ */
+ enum SingleUserMode {
+ SingleUserModeLocked = NDB_SUM_LOCKED,
+ SingleUserModeReadOnly = NDB_SUM_READONLY,
+ SingleUserModeReadWrite = NDB_SUM_READ_WRITE
+ };
+
/**
* @name General
* @{
@@ -895,6 +904,13 @@
*/
void setMinRows(Uint64 minRows);
Uint64 getMinRows() const;
+
+ /**
+ * Set/Get SingleUserMode
+ */
+ void setSingleUserMode(enum SingleUserMode);
+ enum SingleUserMode getSingleUserMode() const;
+
/** @} *******************************************************************/
--- 1.123/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2007-03-20 16:38:17 +01:00
+++ 1.124/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2007-03-23 17:13:20 +01:00
@@ -461,6 +461,7 @@
w.add(DictTabInfo::FragmentCount, tablePtr.p->fragmentCount);
w.add(DictTabInfo::MinRowsLow, tablePtr.p->minRowsLow);
w.add(DictTabInfo::MinRowsHigh, tablePtr.p->minRowsHigh);
+ w.add(DictTabInfo::SingleUserMode, tablePtr.p->singleUserMode);
if(signal)
{
@@ -1871,6 +1872,7 @@
tablePtr.p->m_bits = 0;
tablePtr.p->minRowsLow = 0;
tablePtr.p->minRowsHigh = 0;
+ tablePtr.p->singleUserMode = 0;
tablePtr.p->tableType = DictTabInfo::UserTable;
tablePtr.p->primaryTableId = RNIL;
// volatile elements
@@ -5698,7 +5700,9 @@
signal->theData[4] = (Uint32)tabPtr.p->tableType;
signal->theData[5] = createTabPtr.p->key;
signal->theData[6] = (Uint32)tabPtr.p->noOfPrimkey;
- sendSignal(DBTC_REF, GSN_TC_SCHVERREQ, signal, 7, JBB);
+ signal->theData[7] = (Uint32)tabPtr.p->singleUserMode;
+
+ sendSignal(DBTC_REF, GSN_TC_SCHVERREQ, signal, 8, JBB);
return;
}
@@ -6128,6 +6132,7 @@
tablePtr.p->minRowsHigh = c_tableDesc.MinRowsHigh;
tablePtr.p->defaultNoPartFlag = c_tableDesc.DefaultNoPartFlag;
tablePtr.p->linearHashFlag = c_tableDesc.LinearHashFlag;
+ tablePtr.p->singleUserMode = c_tableDesc.SingleUserMode;
{
Rope frm(c_rope_pool, tablePtr.p->frmData);
--- 1.52/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2007-03-20 16:38:17 +01:00
+++ 1.53/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2007-03-23 17:13:20 +01:00
@@ -375,6 +375,11 @@
Uint32 fragmentCount;
Uint32 m_tablespace_id;
+
+ /*
+ * Access rights to table during single user mode
+ */
+ Uint8 singleUserMode;
};
typedef Ptr<TableRecord> TableRecordPtr;
--- 1.55/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2007-03-22 14:02:27 +01:00
+++ 1.56/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2007-03-23 17:13:20 +01:00
@@ -710,6 +710,7 @@
Uint8 tcindxrec;
+ Uint8 singleUserMode;
ReturnSignal returnsignal;
Uint8 timeOutCounter;
@@ -961,10 +962,21 @@
struct TableRecord {
TableRecord() {}
Uint32 currentSchemaVersion;
- Uint8 enabled;
- Uint8 dropping;
+ Uint16 m_flags;
Uint8 tableType;
- Uint8 storedTable;
+ Uint8 singleUserMode;
+
+ enum {
+ TR_ENABLED = 1 << 0,
+ TR_DROPPING = 1 << 1,
+ TR_STORED_TABLE = 1 << 2
+ };
+ Uint8 get_enabled() const { return (m_flags & TR_ENABLED) != 0; }
+ Uint8 get_dropping() const { return (m_flags & TR_DROPPING) != 0; }
+ Uint8 get_storedTable() const { return (m_flags & TR_STORED_TABLE) != 0; }
+ void set_enabled(Uint8 f) { f ? m_flags |= (Uint16)TR_ENABLED : m_flags &= ~(Uint16)TR_ENABLED; }
+ void set_dropping(Uint8 f) { f ? m_flags |= (Uint16)TR_DROPPING : m_flags &= ~(Uint16)TR_DROPPING; }
+ void set_storedTable(Uint8 f) { f ? m_flags |= (Uint16)TR_STORED_TABLE : m_flags &= ~(Uint16)TR_STORED_TABLE; }
Uint8 noOfKeyAttr;
Uint8 hasCharAttr;
@@ -972,7 +984,7 @@
Uint8 hasVarKeys;
bool checkTable(Uint32 schemaVersion) const {
- return enabled && !dropping &&
+ return get_enabled() && !get_dropping() &&
(table_version_major(schemaVersion) == table_version_major(currentSchemaVersion));
}
@@ -1843,10 +1855,10 @@
Uint32 transid2);
void removeMarkerForFailedAPI(Signal* signal, Uint32 nodeId, Uint32 bucket);
- bool getAllowStartTransaction(Uint32 nodeId) const {
+ bool getAllowStartTransaction(Uint32 nodeId, Uint32 table_single_user_mode) const {
if (unlikely(getNodeState().getSingleUserMode()))
{
- if (getNodeState().getSingleUserApi() == nodeId)
+ if (getNodeState().getSingleUserApi() == nodeId || table_single_user_mode)
return true;
else
return false;
--- 1.147/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-03-22 14:02:27 +01:00
+++ 1.148/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-03-23 17:13:20 +01:00
@@ -331,19 +331,21 @@
tabptr.i = signal->theData[0];
ptrCheckGuard(tabptr, ctabrecFilesize, tableRecord);
tabptr.p->currentSchemaVersion = signal->theData[1];
- tabptr.p->storedTable = (bool)signal->theData[2];
+ tabptr.p->m_flags = 0;
+ tabptr.p->set_storedTable((bool)signal->theData[2]);
BlockReference retRef = signal->theData[3];
tabptr.p->tableType = (Uint8)signal->theData[4];
BlockReference retPtr = signal->theData[5];
Uint32 noOfKeyAttr = signal->theData[6];
+ tabptr.p->singleUserMode = (Uint8)signal->theData[7];
ndbrequire(noOfKeyAttr <= MAX_ATTRIBUTES_IN_INDEX);
const KeyDescriptor* desc = g_key_descriptor_pool.getPtr(tabptr.i);
ndbrequire(noOfKeyAttr == desc->noOfKeyAttr);
- ndbrequire(tabptr.p->enabled == false);
- tabptr.p->enabled = true;
- tabptr.p->dropping = false;
+ ndbrequire(tabptr.p->get_enabled() == false);
+ tabptr.p->set_enabled(true);
+ tabptr.p->set_dropping(false);
tabptr.p->noOfKeyAttr = desc->noOfKeyAttr;
tabptr.p->hasCharAttr = desc->hasCharAttr;
tabptr.p->noOfDistrKeys = desc->noOfDistrKeys;
@@ -367,7 +369,7 @@
Uint32 senderRef = req->senderRef;
Uint32 senderData = req->senderData;
- if(!tabPtr.p->enabled){
+ if(!tabPtr.p->get_enabled()){
jam();
PrepDropTabRef* ref = (PrepDropTabRef*)signal->getDataPtrSend();
ref->senderRef = reference();
@@ -379,7 +381,7 @@
return;
}
- if(tabPtr.p->dropping){
+ if(tabPtr.p->get_dropping()){
jam();
PrepDropTabRef* ref = (PrepDropTabRef*)signal->getDataPtrSend();
ref->senderRef = reference();
@@ -391,7 +393,7 @@
return;
}
- tabPtr.p->dropping = true;
+ tabPtr.p->set_dropping(true);
tabPtr.p->dropTable.senderRef = senderRef;
tabPtr.p->dropTable.senderData = senderData;
@@ -427,7 +429,7 @@
tabPtr.i = conf->tableId;
ptrCheckGuard(tabPtr, ctabrecFilesize, tableRecord);
- ndbrequire(tabPtr.p->dropping == true);
+ ndbrequire(tabPtr.p->get_dropping() == true);
Uint32 nodeId = refToNode(conf->senderRef);
tabPtr.p->dropTable.waitDropTabCount.clearWaitingFor(nodeId);
@@ -457,7 +459,7 @@
tabPtr.i = ref->tableId;
ptrCheckGuard(tabPtr, ctabrecFilesize, tableRecord);
- ndbrequire(tabPtr.p->dropping == true);
+ ndbrequire(tabPtr.p->get_dropping() == true);
Uint32 nodeId = refToNode(ref->senderRef);
tabPtr.p->dropTable.waitDropTabCount.clearWaitingFor(nodeId);
@@ -494,7 +496,7 @@
for(Uint32 i = 0; i<RT_BREAK && tabPtr.i < ctabrecFilesize; i++, tabPtr.i++){
jam();
ptrAss(tabPtr, tableRecord);
- if(tabPtr.p->enabled && tabPtr.p->dropping){
+ if(tabPtr.p->get_enabled() && tabPtr.p->get_dropping()){
if(tabPtr.p->dropTable.waitDropTabCount.isWaitingFor(nodeId)){
jam();
conf->senderRef = calcLqhBlockRef(nodeId);
@@ -535,7 +537,7 @@
Uint32 senderData = req->senderData;
DropTabReq::RequestType rt = (DropTabReq::RequestType)req->requestType;
- if(!tabPtr.p->enabled && rt == DropTabReq::OnlineDropTab){
+ if(!tabPtr.p->get_enabled() && rt == DropTabReq::OnlineDropTab){
jam();
DropTabRef* ref = (DropTabRef*)signal->getDataPtrSend();
ref->senderRef = reference();
@@ -547,7 +549,7 @@
return;
}
- if(!tabPtr.p->dropping && rt == DropTabReq::OnlineDropTab){
+ if(!tabPtr.p->get_dropping() && rt == DropTabReq::OnlineDropTab){
jam();
DropTabRef* ref = (DropTabRef*)signal->getDataPtrSend();
ref->senderRef = reference();
@@ -559,8 +561,8 @@
return;
}
- tabPtr.p->enabled = false;
- tabPtr.p->dropping = false;
+ tabPtr.p->set_enabled(false);
+ tabPtr.p->set_dropping(false);
DropTabConf * conf = (DropTabConf*)signal->getDataPtrSend();
conf->tableId = tabPtr.i;
@@ -1218,8 +1220,7 @@
break;
case NodeState::SL_STOPPING_1:
case NodeState::SL_STOPPING_2:
- if (getNodeState().getSingleUserMode() &&
- getNodeState().getSingleUserApi() == senderNodeId)
+ if (getNodeState().getSingleUserMode())
break;
case NodeState::SL_STOPPING_3:
case NodeState::SL_STOPPING_4:
@@ -1229,9 +1230,6 @@
errCode = ZNODE_SHUTDOWN_IN_PROGRESS;
break;
case NodeState::SL_SINGLEUSER:
- if (getNodeState().getSingleUserApi() == senderNodeId)
- break;
- errCode = ZCLUSTER_IN_SINGLEUSER_MODE;
break;
default:
errCode = ZWRONG_STATE;
@@ -2403,6 +2401,7 @@
regApiPtr->buddyPtr = RNIL;
regApiPtr->currSavePointId = 0;
regApiPtr->m_transaction_nodes.clear();
+ regApiPtr->singleUserMode = 0;
// Trigger data
releaseFiredTriggerData(®ApiPtr->theFiredTriggers),
// Index data
@@ -2556,9 +2555,12 @@
bool isIndexOpReturn = regApiPtr->indexOpReturn;
regApiPtr->isIndexOp = false; // Reset marker
regApiPtr->m_exec_flag |= TexecFlag;
+ TableRecordPtr localTabptr;
+ localTabptr.i = TtabIndex;
+ localTabptr.p = &tableRecord[TtabIndex];
switch (regApiPtr->apiConnectstate) {
case CS_CONNECTED:{
- if (TstartFlag == 1 && getAllowStartTransaction(sendersNodeId) == true){
+ if (TstartFlag == 1 && getAllowStartTransaction(sendersNodeId, localTabptr.p->singleUserMode) == true){
//---------------------------------------------------------------------
// Initialise API connect record if transaction is started.
//---------------------------------------------------------------------
@@ -2566,7 +2568,7 @@
initApiConnectRec(signal, regApiPtr);
regApiPtr->m_exec_flag = TexecFlag;
} else {
- if(getAllowStartTransaction(sendersNodeId) == true){
+ if(getAllowStartTransaction(sendersNodeId, localTabptr.p->singleUserMode) == true){
/*------------------------------------------------------------------
* WE EXPECTED A START TRANSACTION. SINCE NO OPERATIONS HAVE BEEN
* RECEIVED WE INDICATE THIS BY SETTING FIRST_TC_CONNECT TO RNIL TO
@@ -2593,6 +2595,13 @@
* the state will be CS_STARTED
*/
jam();
+ if (unlikely(getNodeState().getSingleUserMode()) &&
+ getNodeState().getSingleUserApi() != sendersNodeId &&
+ !localTabptr.p->singleUserMode)
+ {
+ TCKEY_abort(signal, TexecFlag ? 60 : 57);
+ return;
+ }
initApiConnectRec(signal, regApiPtr);
regApiPtr->m_exec_flag = TexecFlag;
} else {
@@ -2613,6 +2622,10 @@
case CS_ABORTING:
if (regApiPtr->abortState == AS_IDLE) {
if (TstartFlag == 1) {
+ if(getAllowStartTransaction(sendersNodeId, localTabptr.p->singleUserMode) == false){
+ TCKEY_abort(signal, TexecFlag ? 60 : 57);
+ return;
+ }
//--------------------------------------------------------------------
// Previous transaction had been aborted and the abort was completed.
// It is then OK to start a new transaction again.
@@ -2676,9 +2689,6 @@
return;
}//switch
- TableRecordPtr localTabptr;
- localTabptr.i = TtabIndex;
- localTabptr.p = &tableRecord[TtabIndex];
if (localTabptr.p->checkTable(tcKeyReq->tableSchemaVersion)) {
;
} else {
@@ -2737,6 +2747,8 @@
regTcPtr->savePointId = regApiPtr->currSavePointId;
regApiPtr->executingIndexOp = RNIL;
+ regApiPtr->singleUserMode |= 1 << localTabptr.p->singleUserMode;
+
if (TcKeyReq::getExecutingTrigger(Treqinfo)) {
// Save the TcOperationPtr for fireing operation
regTcPtr->triggeringOperation = TsenderData;
@@ -2868,7 +2880,7 @@
* THIS VARIABLE CONTROLS THE INTERVAL BETWEEN LCP'S AND
* TEMP TABLES DON'T PARTICIPATE.
* -------------------------------------------------------------------- */
- if (localTabptr.p->storedTable) {
+ if (localTabptr.p->get_storedTable()) {
coperationsize = ((Toperationsize + TattrLen) + TkeyLength) + 17;
}
c_counters.cwriteCount = TwriteCount + 1;
@@ -4701,6 +4713,7 @@
regApiPtr->lqhkeyconfrec = Tlqhkeyconfrec;
regApiPtr->commitAckMarker = TcommitAckMarker;
regApiPtr->m_transaction_nodes = Tnodes;
+ regApiPtr->singleUserMode = 0;
gcpPtr.i = TgcpPointer;
ptrCheckGuard(gcpPtr, TgcpFilesize, localGcpRecord);
@@ -4712,6 +4725,7 @@
regTmpApiPtr->firstTcConnect = RNIL;
regTmpApiPtr->lastTcConnect = RNIL;
regTmpApiPtr->m_transaction_nodes.clear();
+ regTmpApiPtr->singleUserMode = 0;
releaseAllSeizedIndexOperations(regTmpApiPtr);
}//Dbtc::copyApi()
@@ -6226,24 +6240,30 @@
Uint32 api_timer= getApiConTimer(api_con_ptr);
jam();
if (api_timer != 0) {
+ Uint32 error= ZTIME_OUT_ERROR;
time_out_value= time_out_param + (api_con_ptr & mask_value);
if (unlikely(old_mask_value)) // abort during single user mode
{
apiConnectptr.i = api_con_ptr;
ptrCheckGuard(apiConnectptr, capiConnectFilesize, apiConnectRecord);
- if (getNodeState().getSingleUserApi() ==
- refToNode(apiConnectptr.p->ndbapiBlockref))
+ if ((getNodeState().getSingleUserApi() ==
+ refToNode(apiConnectptr.p->ndbapiBlockref)) ||
+ !(apiConnectptr.p->singleUserMode & (1 << NDB_SUM_LOCKED)))
{
// api allowed during single user, use original timeout
time_out_value=
old_time_out_param + (api_con_ptr & old_mask_value);
}
+ else
+ {
+ error= ZCLUSTER_IN_SINGLEUSER_MODE;
+ }
}
time_passed= tc_timer - api_timer;
if (time_passed > time_out_value)
{
jam();
- timeOutFoundLab(signal, api_con_ptr, ZTIME_OUT_ERROR);
+ timeOutFoundLab(signal, api_con_ptr, error);
api_con_ptr++;
break;
}
@@ -6283,7 +6303,8 @@
<< " code: " << errCode);
switch (apiConnectptr.p->apiConnectstate) {
case CS_STARTED:
- if(apiConnectptr.p->lqhkeyreqrec == apiConnectptr.p->lqhkeyconfrec){
+ if(apiConnectptr.p->lqhkeyreqrec == apiConnectptr.p->lqhkeyconfrec &&
+ errCode != ZCLUSTER_IN_SINGLEUSER_MODE){
jam();
/*
We are waiting for application to continue the transaction. In this
@@ -8258,6 +8279,7 @@
apiConnectptr.p->ndbapiConnect = 0;
apiConnectptr.p->buddyPtr = RNIL;
apiConnectptr.p->m_transaction_nodes.clear();
+ apiConnectptr.p->singleUserMode = 0;
setApiConTimer(apiConnectptr.i, 0, __LINE__);
switch(ttransStatus){
case LqhTransConf::Committed:
@@ -10173,6 +10195,7 @@
apiConnectptr.p->buddyPtr = RNIL;
apiConnectptr.p->currSavePointId = 0;
apiConnectptr.p->m_transaction_nodes.clear();
+ apiConnectptr.p->singleUserMode = 0;
}//for
apiConnectptr.i = tiacTmp - 1;
ptrCheckGuard(apiConnectptr, capiConnectFilesize, apiConnectRecord);
@@ -10201,6 +10224,7 @@
apiConnectptr.p->buddyPtr = RNIL;
apiConnectptr.p->currSavePointId = 0;
apiConnectptr.p->m_transaction_nodes.clear();
+ apiConnectptr.p->singleUserMode = 0;
}//for
apiConnectptr.i = (2 * tiacTmp) - 1;
ptrCheckGuard(apiConnectptr, capiConnectFilesize, apiConnectRecord);
@@ -10229,6 +10253,7 @@
apiConnectptr.p->buddyPtr = RNIL;
apiConnectptr.p->currSavePointId = 0;
apiConnectptr.p->m_transaction_nodes.clear();
+ apiConnectptr.p->singleUserMode = 0;
}//for
apiConnectptr.i = (3 * tiacTmp) - 1;
ptrCheckGuard(apiConnectptr, capiConnectFilesize, apiConnectRecord);
@@ -10413,10 +10438,11 @@
refresh_watch_dog();
ptrAss(tabptr, tableRecord);
tabptr.p->currentSchemaVersion = 0;
- tabptr.p->storedTable = true;
+ tabptr.p->m_flags = 0;
+ tabptr.p->set_storedTable(true);
tabptr.p->tableType = 0;
- tabptr.p->enabled = false;
- tabptr.p->dropping = false;
+ tabptr.p->set_enabled(false);
+ tabptr.p->set_dropping(false);
tabptr.p->noOfKeyAttr = 0;
tabptr.p->hasCharAttr = 0;
tabptr.p->noOfDistrKeys = 0;
@@ -10550,6 +10576,7 @@
apiConnectptr.p->firstTcConnect = RNIL;
apiConnectptr.p->lastTcConnect = RNIL;
apiConnectptr.p->m_transaction_nodes.clear();
+ apiConnectptr.p->singleUserMode = 0;
// MASV let state be CS_ABORTING until all
// signals in the "air" have been received. Reset to CS_CONNECTED
@@ -11434,7 +11461,7 @@
const Uint32 senderData = req->senderData;
const BlockReference senderRef = req->senderRef;
- if(getAllowStartTransaction(refToNode(senderRef)) == true && !getNodeState().getSingleUserMode()){
+ if(getAllowStartTransaction(refToNode(senderRef), 0) == true && !getNodeState().getSingleUserMode()){
jam();
ref->senderData = senderData;
@@ -13711,9 +13738,9 @@
Uint32
Dbtc::TableRecord::getErrorCode(Uint32 schemaVersion) const {
- if(!enabled)
+ if(!get_enabled())
return ZNO_SUCH_TABLE;
- if(dropping)
+ if(get_dropping())
return ZDROP_TABLE_IN_PROGRESS;
if(table_version_major(schemaVersion) != table_version_major(currentSchemaVersion))
return ZWRONG_SCHEMA_VERSION_ERROR;
--- 1.56/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp 2007-03-22 11:34:00 +01:00
+++ 1.57/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp 2007-03-23 17:13:20 +01:00
@@ -1684,6 +1684,7 @@
//w.add(DictTabInfo::NoOfVariable, (Uint32)0);
//w.add(DictTabInfo::KeyLength, 1);
w.add(DictTabInfo::TableTypeVal, (Uint32)table.tableType);
+ w.add(DictTabInfo::SingleUserMode, (Uint32)NDB_SUM_READ_WRITE);
for (unsigned i = 0; i < table.columnCount; i++) {
const SysColumn& column = table.columnList[i];
--- 1.69/storage/ndb/src/ndbapi/NdbDictionary.cpp 2007-02-22 15:49:31 +01:00
+++ 1.70/storage/ndb/src/ndbapi/NdbDictionary.cpp 2007-03-23 17:13:21 +01:00
@@ -495,6 +495,18 @@
return m_impl.getFrmLength();
}
+enum NdbDictionary::Table::SingleUserMode
+NdbDictionary::Table::getSingleUserMode() const
+{
+ return (enum SingleUserMode)m_impl.m_single_user_mode;
+}
+
+void
+NdbDictionary::Table::setSingleUserMode(enum NdbDictionary::Table::SingleUserMode mode)
+{
+ m_impl.m_single_user_mode = (Uint8)mode;
+}
+
void
NdbDictionary::Table::setTablespaceNames(const void *data, Uint32 len)
{
--- 1.164/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2007-03-20 16:38:18 +01:00
+++ 1.165/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2007-03-23 17:13:21 +01:00
@@ -51,7 +51,7 @@
#define ERR_RETURN(a,b) \
{\
- DBUG_PRINT("exit", ("error %d", (a).code));\
+ DBUG_PRINT("exit", ("error %d return %d", (a).code, b));\
DBUG_RETURN(b);\
}
@@ -470,6 +470,7 @@
m_tablespace_name.clear();
m_tablespace_id = ~0;
m_tablespace_version = ~0;
+ m_single_user_mode = 0;
}
bool
@@ -663,6 +664,15 @@
DBUG_RETURN(false);
}
}
+
+ if(m_single_user_mode != obj.m_single_user_mode)
+ {
+ DBUG_PRINT("info",("m_single_user_mode %d != %d",
+ (int32)m_single_user_mode,
+ (int32)obj.m_single_user_mode));
+ DBUG_RETURN(false);
+ }
+
DBUG_RETURN(true);
}
@@ -726,6 +736,8 @@
m_keyLenInWords = org.m_keyLenInWords;
m_fragmentCount = org.m_fragmentCount;
+ m_single_user_mode = org.m_single_user_mode;
+
if (m_index != 0)
delete m_index;
m_index = org.m_index;
@@ -2103,6 +2115,7 @@
impl->m_kvalue = tableDesc->TableKValue;
impl->m_minLoadFactor = tableDesc->MinLoadFactor;
impl->m_maxLoadFactor = tableDesc->MaxLoadFactor;
+ impl->m_single_user_mode = tableDesc->SingleUserMode;
impl->m_indexType = (NdbDictionary::Object::Type)
getApiConstant(tableDesc->TableType,
@@ -2564,6 +2577,7 @@
tmpTab->MinRowsLow = (Uint32)(impl.m_min_rows & 0xFFFFFFFF);
tmpTab->DefaultNoPartFlag = impl.m_default_no_part_flag;
tmpTab->LinearHashFlag = impl.m_linear_flag;
+ tmpTab->SingleUserMode = impl.m_single_user_mode;
if (impl.m_ts_name.length())
{
--- 1.73/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp 2007-02-22 15:49:31 +01:00
+++ 1.74/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp 2007-03-23 17:13:21 +01:00
@@ -204,6 +204,7 @@
int m_maxLoadFactor;
Uint16 m_keyLenInWords;
Uint16 m_fragmentCount;
+ Uint8 m_single_user_mode;
NdbIndexImpl * m_index;
NdbColumnImpl * getColumn(unsigned attrId);
--- 1.429/sql/ha_ndbcluster.cc 2007-03-22 18:14:21 +01:00
+++ 1.430/sql/ha_ndbcluster.cc 2007-03-23 17:13:20 +01:00
@@ -4749,6 +4749,7 @@
bool create_from_engine= (create_info->table_options & HA_OPTION_CREATE_FROM_ENGINE);
bool is_truncate= (thd->lex->sql_command == SQLCOM_TRUNCATE);
char tablespace[FN_LEN];
+ NdbDictionary::Table::SingleUserMode single_user_mode= NdbDictionary::Table::SingleUserModeLocked;
DBUG_ENTER("ha_ndbcluster::create");
DBUG_PRINT("enter", ("name: %s", name));
@@ -4800,19 +4801,23 @@
schema distribution table is setup
( unless it is a creation of the schema dist table itself )
*/
- if (!ndb_schema_share &&
- !(strcmp(m_dbname, NDB_REP_DB) == 0 &&
- strcmp(m_tabname, NDB_SCHEMA_TABLE) == 0))
+ if (!ndb_schema_share)
{
- DBUG_PRINT("info", ("Schema distribution table not setup"));
- DBUG_RETURN(HA_ERR_NO_CONNECTION);
+ if (!(strcmp(m_dbname, NDB_REP_DB) == 0 &&
+ strcmp(m_tabname, NDB_SCHEMA_TABLE) == 0))
+ {
+ DBUG_PRINT("info", ("Schema distribution table not setup"));
+ DBUG_RETURN(HA_ERR_NO_CONNECTION);
+ }
+ single_user_mode = NdbDictionary::Table::SingleUserModeReadWrite;
}
#endif /* HAVE_NDB_BINLOG */
DBUG_PRINT("table", ("name: %s", m_tabname));
tab.setName(m_tabname);
tab.setLogging(!(create_info->options & HA_LEX_CREATE_TMP_TABLE));
-
+ tab.setSingleUserMode(single_user_mode);
+
// Save frm data for this table
if (readfrm(name, &data, &length))
DBUG_RETURN(1);
@@ -5576,6 +5581,7 @@
{
ndb_table_id= h->m_table->getObjectId();
ndb_table_version= h->m_table->getObjectVersion();
+ DBUG_PRINT("info", ("success 1"));
}
else
{
@@ -5589,6 +5595,7 @@
break;
}
res= ndb_to_mysql_error(&dict->getNdbError());
+ DBUG_PRINT("info", ("error(1) %u", res));
}
h->release_metadata(thd, ndb);
}
@@ -5605,6 +5612,8 @@
{
ndb_table_id= ndbtab_g.get_table()->getObjectId();
ndb_table_version= ndbtab_g.get_table()->getObjectVersion();
+ DBUG_PRINT("info", ("success 2"));
+ break;
}
else
{
@@ -5624,8 +5633,8 @@
}
}
}
- else
- res= ndb_to_mysql_error(&dict->getNdbError());
+ res= ndb_to_mysql_error(&dict->getNdbError());
+ DBUG_PRINT("info", ("error(2) %u", res));
break;
}
}
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2498) | tomas | 23 Mar |
