database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysql-test ndb_index_unique

Browse Source 
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Compensate for "extra" lqhkeyreqrec during index read (when IgnoreError)
ndb/src/mgmsrv/main.cpp:
  Read corrent local node id
ndb/tools/waiter.cpp:
  Yet another user of LocalConfig
This commit is contained in:
unknown
2004-08-09 15:13:46 +02:00
parent 96587f58c8
commit 520a745891
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
View File

@ -5004,6 +5004,7 @@ void Dbtc::execLQHKEYREF(Signal* signal)
setApiConTimer(apiConnectptr.i, ctcTimer, __LINE__); setApiConTimer(apiConnectptr.i, ctcTimer, __LINE__);
if (isIndexOp) { if (isIndexOp) {
jam(); jam();
regApiPtr->lqhkeyreqrec--; // Compensate for extra during read
tcKeyRef->connectPtr = indexOp; tcKeyRef->connectPtr = indexOp;
EXECUTE_DIRECT(DBTC, GSN_TCKEYREF, signal, TcKeyRef::SignalLength); EXECUTE_DIRECT(DBTC, GSN_TCKEYREF, signal, TcKeyRef::SignalLength);
} else { } else {

6
ndb/src/mgmsrv/main.cpp
View File

@ -312,12 +312,10 @@ static bool
readLocalConfig(){ readLocalConfig(){
// Read local config file // Read local config file
LocalConfig lc; LocalConfig lc;
int nodeid = lc.init(glob.local_config_filename); if(!lc.init(glob.local_config_filename))
if(nodeid == -1){
return false; return false;
}
glob.localNodeId = nodeid; glob.localNodeId = lc._ownNodeId;
return true; return true;
} }

8
ndb/tools/waiter.cpp
View File

@ -22,7 +22,7 @@
#include <NdbSleep.h> #include <NdbSleep.h>
#include <getarg.h> #include <getarg.h>
#include <kernel/ndb_limits.h> #include <kernel/ndb_limits.h>
#include "../src/common/mgmcommon/LocalConfig.hpp" #include "../include/mgmcommon/LocalConfig.hpp"
#include <NDBT.hpp> #include <NDBT.hpp>
@ -67,13 +67,13 @@ int main(int argc, const char** argv){
return NDBT_ProgramExit(NDBT_FAILED); return NDBT_ProgramExit(NDBT_FAILED);
} }
for (int i = 0; i<lcfg.items; i++) for (int i = 0; i<lcfg.ids.size();i++)
{ {
MgmtSrvrId * m = lcfg.ids[i]; MgmtSrvrId * m = &lcfg.ids[i];
switch(m->type){ switch(m->type){
case MgmId_TCP: case MgmId_TCP:
snprintf(buf, 255, "%s:%d", m->data.tcp.remoteHost, m->data.tcp.port); snprintf(buf, 255, "%s:%d", m->name.c_str(), m->port);
_hostName = buf; _hostName = buf;
break; break;
case MgmId_File: case MgmId_File: