#At file:///home/marty/MySQL/mysql-5.1-telco-7.0/
3125 Martin Skold 2009-10-15 [merge]
Merge
modified:
storage/ndb/include/kernel/GlobalSignalNumbers.h
storage/ndb/include/kernel/kernel_config_parameters.h
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
storage/ndb/src/kernel/vm/Configuration.cpp
=== modified file 'storage/ndb/include/kernel/GlobalSignalNumbers.h'
--- a/storage/ndb/include/kernel/GlobalSignalNumbers.h 2009-10-12 07:07:14 +0000
+++ b/storage/ndb/include/kernel/GlobalSignalNumbers.h 2009-10-15 12:36:53 +0000
@@ -334,13 +334,13 @@ extern const GlobalSignalNumber NO_OF_SI
/* 230 not unused */
/* 231 not unused */
-#define GSN_DIRELEASECONF 232
-#define GSN_DIRELEASEREF 233
-#define GSN_DIRELEASEREQ 234
+/* 232 unused */
+/* 233 unused */
+/* 234 unused */
#define GSN_DISCONNECT_REP 235
-#define GSN_DISEIZECONF 236
-#define GSN_DISEIZEREF 237
-#define GSN_DISEIZEREQ 238
+/* 236 unused */
+/* 237 unused */
+/* 238 unused */
#define GSN_DIVERIFYCONF 239
#define GSN_DIVERIFYREF 240
#define GSN_DIVERIFYREQ 241
=== modified file 'storage/ndb/include/kernel/kernel_config_parameters.h'
--- a/storage/ndb/include/kernel/kernel_config_parameters.h 2009-09-09 10:58:10 +0000
+++ b/storage/ndb/include/kernel/kernel_config_parameters.h 2009-10-15 12:36:53 +0000
@@ -35,7 +35,6 @@
#define CFG_DICT_TABLE (PRIVATE_BASE + 13)
#define CFG_DIH_API_CONNECT (PRIVATE_BASE + 15)
-#define CFG_DIH_CONNECT (PRIVATE_BASE + 16)
#define CFG_DIH_FRAG_CONNECT (PRIVATE_BASE + 17)
#define CFG_DIH_MORE_NODES (PRIVATE_BASE + 18)
#define CFG_DIH_REPLICAS (PRIVATE_BASE + 19)
=== modified file 'storage/ndb/src/common/debugger/signaldata/SignalNames.cpp'
--- a/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp 2009-10-12 07:07:14 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp 2009-10-15 12:36:53 +0000
@@ -163,13 +163,7 @@ const GsnName SignalNames [] = {
,{ GSN_DIH_RESTARTREF, "DIH_RESTARTREF" }
,{ GSN_DIH_RESTARTREQ, "DIH_RESTARTREQ" }
- ,{ GSN_DIRELEASECONF, "DIRELEASECONF" }
- ,{ GSN_DIRELEASEREF, "DIRELEASEREF" }
- ,{ GSN_DIRELEASEREQ, "DIRELEASEREQ" }
,{ GSN_DISCONNECT_REP, "DISCONNECT_REP" }
- ,{ GSN_DISEIZECONF, "DISEIZECONF" }
- ,{ GSN_DISEIZEREF, "DISEIZEREF" }
- ,{ GSN_DISEIZEREQ, "DISEIZEREQ" }
,{ GSN_DIVERIFYCONF, "DIVERIFYCONF" }
,{ GSN_DIVERIFYREF, "DIVERIFYREF" }
,{ GSN_DIVERIFYREQ, "DIVERIFYREQ" }
=== modified file 'storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp 2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp 2009-10-15 12:31:11 +0000
@@ -208,6 +208,7 @@ print(const char * filename, const Schem
NDB_COMMAND(printSchemafile,
"printSchemafile", "printSchemafile", "Prints a schemafile", 16384)
{
+ ndb_init();
progname = argv[0];
int exitcode = 0;
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp 2009-09-19 06:30:50 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp 2009-10-15 12:36:53 +0000
@@ -741,8 +741,6 @@ private:
void execPREPARE_COPY_FRAG_CONF(Signal*);
void execDIADDTABREQ(Signal *);
void execDIGETNODESREQ(Signal *);
- void execDIRELEASEREQ(Signal *);
- void execDISEIZEREQ(Signal *);
void execSTTOR(Signal *);
void execDIH_SCAN_TAB_REQ(Signal *);
void execDIH_SCAN_GET_NODES_REQ(Signal *);
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp 2009-09-09 08:49:45 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp 2009-10-15 12:36:53 +0000
@@ -204,8 +204,6 @@ Dbdih::Dbdih(Block_context& ctx):
addRecSignal(GSN_COPY_FRAGREF, &Dbdih::execCOPY_FRAGREF);
addRecSignal(GSN_DIADDTABREQ, &Dbdih::execDIADDTABREQ);
addRecSignal(GSN_DIGETNODESREQ, &Dbdih::execDIGETNODESREQ);
- addRecSignal(GSN_DIRELEASEREQ, &Dbdih::execDIRELEASEREQ);
- addRecSignal(GSN_DISEIZEREQ, &Dbdih::execDISEIZEREQ);
addRecSignal(GSN_STTOR, &Dbdih::execSTTOR);
addRecSignal(GSN_DIH_SCAN_TAB_REQ, &Dbdih::execDIH_SCAN_TAB_REQ);
addRecSignal(GSN_DIH_SCAN_GET_NODES_REQ, &Dbdih::execDIH_SCAN_GET_NODES_REQ);
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2009-09-24 17:23:38 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2009-10-15 12:36:53 +0000
@@ -1252,12 +1252,11 @@ void Dbdih::execREAD_CONFIG_REQ(Signal*
initData();
+ cconnectFileSize = 256; // Only used for DDL
+
ndbrequireErr(!ndb_mgm_get_int_parameter(p, CFG_DIH_API_CONNECT,
&capiConnectFileSize),
NDBD_EXIT_INVALID_CONFIG);
- ndbrequireErr(!ndb_mgm_get_int_parameter(p, CFG_DIH_CONNECT,
- &cconnectFileSize),
- NDBD_EXIT_INVALID_CONFIG);
ndbrequireErr(!ndb_mgm_get_int_parameter(p, CFG_DIH_FRAG_CONNECT,
&cfragstoreFileSize),
NDBD_EXIT_INVALID_CONFIG);
@@ -6920,51 +6919,6 @@ void Dbdih::nodeFailCompletedCheckLab(Si
************************************
*/
/*
- 3.4.1 L O C A L N O D E S E I Z E R E Q U E S T
- ******************************************************
- */
-void Dbdih::execDISEIZEREQ(Signal* signal)
-{
- ConnectRecordPtr connectPtr;
- jamEntry();
- Uint32 userPtr = signal->theData[0];
- BlockReference userRef = signal->theData[1];
- ndbrequire(cfirstconnect != RNIL);
- connectPtr.i = cfirstconnect;
- ptrCheckGuard(connectPtr, cconnectFileSize, connectRecord);
- cfirstconnect = connectPtr.p->nextPool;
- connectPtr.p->nextPool = RNIL;
- connectPtr.p->userpointer = userPtr;
- connectPtr.p->userblockref = userRef;
- connectPtr.p->connectState = ConnectRecord::INUSE;
- signal->theData[0] = connectPtr.p->userpointer;
- signal->theData[1] = connectPtr.i;
- sendSignal(userRef, GSN_DISEIZECONF, signal, 2, JBB);
-}//Dbdih::execDISEIZEREQ()
-
-/*
- 3.5 L O C A L N O D E R E L E A S E
- ****************************************
- */
-/*
- 3.5.1 L O C A L N O D E R E L E A S E R E Q U E S T
- *******************************************************=
- */
-void Dbdih::execDIRELEASEREQ(Signal* signal)
-{
- ConnectRecordPtr connectPtr;
- jamEntry();
- connectPtr.i = signal->theData[0];
- Uint32 userRef = signal->theData[2];
- ptrCheckGuard(connectPtr, cconnectFileSize, connectRecord);
- ndbrequire(connectPtr.p->connectState != ConnectRecord::FREE);
- ndbrequire(connectPtr.p->userblockref == userRef);
- signal->theData[0] = connectPtr.p->userpointer;
- sendSignal(connectPtr.p->userblockref, GSN_DIRELEASECONF, signal, 1, JBB);
- release_connect(connectPtr);
-}//Dbdih::execDIRELEASEREQ()
-
-/*
3.7 A D D T A B L E
**********************=
*/
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp 2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp 2009-10-15 12:31:11 +0000
@@ -124,6 +124,7 @@ print(const char * filename, const Sysfi
NDB_COMMAND(printSysfile,
"printSysfile", "printSysfile", "Prints a sysfile", 16384){
+ ndb_init();
if(argc < 2){
usage(argv[0]);
return 0;
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp 2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp 2009-10-15 12:31:11 +0000
@@ -120,6 +120,7 @@ print(const char * filename, const Sysfi
NDB_COMMAND(printSysfile,
"printSysfile", "printSysfile", "Prints a sysfile", 16384){
+ ndb_init();
if(argc < 2){
usage(argv[0]);
return 0;
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2009-10-09 09:28:56 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2009-10-15 12:36:53 +0000
@@ -172,7 +172,6 @@ public:
};
enum OperationState {
- OS_CONNECTING_DICT = 0,
OS_CONNECTED = 1,
OS_OPERATING = 2,
OS_PREPARED = 3,
@@ -848,7 +847,6 @@ public:
// with indexes almost never used.
//---------------------------------------------------
UintR clientData; /* SENDERS OPERATION POINTER */
- UintR dihConnectptr; /* CONNECTION TO DIH BLOCK ON THIS NODE */
UintR prevTcConnect; /* DOUBLY LINKED LIST OF TC CONNECT RECORDS*/
UintR savePointId;
@@ -1305,7 +1303,6 @@ private:
void execDIGETNODESREF(Signal* signal);
void execDIH_SCAN_GET_NODES_REF(Signal* signal);
void execDIH_SCAN_GET_NODES_CONF(Signal* signal);
- void execDISEIZECONF(Signal* signal);
void execDIVERIFYCONF(Signal* signal);
void execDIH_SCAN_TAB_REF(Signal* signal);
void execDIH_SCAN_TAB_CONF(Signal* signal);
@@ -1611,7 +1608,6 @@ private:
void scanCompletedLab(Signal* signal);
void scanError(Signal* signal, ScanRecordPtr, Uint32 errorCode);
void diverify010Lab(Signal* signal);
- void intstartphase2x010Lab(Signal* signal);
void intstartphase3x010Lab(Signal* signal);
void sttorryLab(Signal* signal);
void abortBeginErrorLab(Signal* signal);
@@ -1626,7 +1622,6 @@ private:
void timeOutLoopStartLab(Signal* signal, Uint32 apiConnectPtr);
void initialiseRecordsLab(Signal* signal, UintR Tdata0, Uint32, Uint32);
void tckeyreq020Lab(Signal* signal);
- void intstartphase2x020Lab(Signal* signal);
void intstartphase1x010Lab(Signal* signal);
void startphase1x010Lab(Signal* signal);
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp 2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp 2009-10-15 12:36:53 +0000
@@ -233,7 +233,6 @@ Dbtc::Dbtc(Block_context& ctx):
addRecSignal(GSN_COMMITTED, &Dbtc::execCOMMITTED);
addRecSignal(GSN_DIH_SCAN_GET_NODES_CONF, &Dbtc::execDIH_SCAN_GET_NODES_CONF);
addRecSignal(GSN_DIH_SCAN_GET_NODES_REF, &Dbtc::execDIH_SCAN_GET_NODES_REF);
- addRecSignal(GSN_DISEIZECONF, &Dbtc::execDISEIZECONF);
addRecSignal(GSN_DIVERIFYCONF, &Dbtc::execDIVERIFYCONF);
addRecSignal(GSN_DIH_SCAN_TAB_CONF, &Dbtc::execDIH_SCAN_TAB_CONF);
addRecSignal(GSN_DIH_SCAN_TAB_REF, &Dbtc::execDIH_SCAN_TAB_REF);
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2009-10-08 11:15:24 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2009-10-15 12:36:53 +0000
@@ -662,7 +662,7 @@ void Dbtc::execNDB_STTOR(Signal* signal)
return;
case ZINTSPH2:
jam();
- intstartphase2x010Lab(signal);
+ ndbsttorry010Lab(signal);
return;
case ZINTSPH3:
jam();
@@ -765,43 +765,6 @@ void Dbtc::intstartphase1x010Lab(Signal*
}//Dbtc::intstartphase1x010Lab()
/*****************************************************************************/
-/* I N T S T A R T P H A S E 2 X */
-/* SET-UP LOCAL CONNECTIONS. */
-/*****************************************************************************/
-void Dbtc::intstartphase2x010Lab(Signal* signal)
-{
- tcConnectptr.i = cfirstfreeTcConnect;
- intstartphase2x020Lab(signal);
-}//Dbtc::intstartphase2x010Lab()
-
-void Dbtc::intstartphase2x020Lab(Signal* signal)
-{
- if (tcConnectptr.i == RNIL) {
- jam();
- ndbsttorry010Lab(signal);
- return;
- }//if
- ptrCheckGuard(tcConnectptr, ctcConnectFilesize, tcConnectRecord);
- tcConnectptr.p->tcConnectstate = OS_CONNECTING_DICT;
-/* ****************** */
-/* DISEIZEREQ < */
-/* ****************** */
- signal->theData[0] = tcConnectptr.i;
- signal->theData[1] = cownref;
- sendSignal(cdihblockref, GSN_DISEIZEREQ, signal, 2, JBB);
-}//Dbtc::intstartphase2x020Lab()
-
-void Dbtc::execDISEIZECONF(Signal* signal)
-{
- jamEntry();
- tcConnectptr.i = signal->theData[0];
- ptrCheckGuard(tcConnectptr, ctcConnectFilesize, tcConnectRecord);
- tcConnectptr.p->dihConnectptr = signal->theData[1];
- tcConnectptr.i = tcConnectptr.p->nextTcConnect;
- intstartphase2x020Lab(signal);
-}//Dbtc::execDISEIZECONF()
-
-/*****************************************************************************/
/* I N T S T A R T P H A S E 3 X */
/* PREPARE DISTRIBUTED CONNECTIONS */
/*****************************************************************************/
=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp 2009-09-09 10:58:10 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp 2009-10-15 12:36:53 +0000
@@ -786,9 +786,6 @@ Configuration::calcSizeAlt(ConfigValues
cfg.put(CFG_DIH_API_CONNECT,
2 * noOfTransactions);
- cfg.put(CFG_DIH_CONNECT,
- noOfOperations + noOfTransactions + 46);
-
Uint32 noFragPerTable= ((noOfDBNodes + NO_OF_FRAGS_PER_CHUNK - 1) >>
LOG_NO_OF_FRAGS_PER_CHUNK) <<
LOG_NO_OF_FRAGS_PER_CHUNK;
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.0 branch (Martin.Skold:3125) | Martin Skold | 15 Oct |
