mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mysql-test ndb_index_unique

Browse source
This commit is contained in:
joreland@mysql.com 2004-08-09 15:13:46 +02:00
parent e7d89abf33
commit 8b32c7ef44
3 changed files with 7 additions and 8 deletions
Show stats 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__);
if (isIndexOp) {
jam();
regApiPtr->lqhkeyreqrec--; // Compensate for extra during read
tcKeyRef->connectPtr = indexOp;
EXECUTE_DIRECT(DBTC, GSN_TCKEYREF, signal, TcKeyRef::SignalLength);
} else {

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

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

8
ndb/tools/waiter.cpp
View file

@ -22,7 +22,7 @@
#include <NdbSleep.h>
#include <getarg.h>
#include <kernel/ndb_limits.h>
#include "../src/common/mgmcommon/LocalConfig.hpp"
#include "../include/mgmcommon/LocalConfig.hpp"
#include <NDBT.hpp>
@ -67,13 +67,13 @@ int main(int argc, const char** argv){
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){
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;
break;
case MgmId_File: