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

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main

Browse source 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup
This commit is contained in:
stewart@mysql.com 2005-12-19 19:01:20 +11:00
commit 50e3a9cdb3
4 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/src/kernel/blocks/backup/Backup.cpp
View file

@ -3871,7 +3871,7 @@ Backup::checkFile(Signal* signal, BackupFilePtr filePtr)
req->userReference = reference();
req->varIndex = 0;
req->offset = tmp - c_startOfPages;
req->size = sz; // Avrunda uppot
req->size = sz; // Round up
sendSignal(NDBFS_REF, GSN_FSAPPENDREQ, signal,
FsAppendReq::SignalLength, JBA);

14
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file

@ -11135,7 +11135,11 @@ void Dbdih::initCommonData()
cnoReplicas = 1;
ndb_mgm_get_int_parameter(p, CFG_DB_NO_REPLICAS, &cnoReplicas);
cnoReplicas = cnoReplicas > 4 ? 4 : cnoReplicas;
if (cnoReplicas > 4)
{
progError(__LINE__, NDBD_EXIT_INVALID_CONFIG,
"Only up to four replicas are supported. Check NoOfReplicas.");
}
cgcpDelay = 2000;
ndb_mgm_get_int_parameter(p, CFG_DB_GCP_INTERVAL, &cgcpDelay);
@ -11723,14 +11727,14 @@ void Dbdih::execCHECKNODEGROUPSREQ(Signal* signal)
break;
case CheckNodeGroups::GetNodeGroupMembers: {
ok = true;
Uint32 ownNodeGoup =
Uint32 ownNodeGroup =
Sysfile::getNodeGroup(sd->nodeId, SYSFILE->nodeGroups);
sd->output = ownNodeGoup;
sd->output = ownNodeGroup;
sd->mask.clear();
NodeGroupRecordPtr ngPtr;
ngPtr.i = ownNodeGoup;
ngPtr.i = ownNodeGroup;
ptrAss(ngPtr, nodeGroupRecord);
for (Uint32 j = 0; j < ngPtr.p->nodeCount; j++) {
jam();
@ -11738,7 +11742,7 @@ void Dbdih::execCHECKNODEGROUPSREQ(Signal* signal)
}
#if 0
for (int i = 0; i < MAX_NDB_NODES; i++) {
if (ownNodeGoup ==
if (ownNodeGroup ==
Sysfile::getNodeGroup(i, SYSFILE->nodeGroups)) {
sd->mask.set(i);
}

30
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file

@ -18578,60 +18578,54 @@ void
Dblqh::execCREATE_TRIG_REQ(Signal* signal)
{
jamEntry();
NodeId myNodeId = getOwnNodeId();
BlockReference tupref = calcTupBlockRef(myNodeId);
sendSignal(tupref, GSN_CREATE_TRIG_REQ, signal, CreateTrigReq::SignalLength, JBB);
sendSignal(DBTUP_REF, GSN_CREATE_TRIG_REQ, signal,
CreateTrigReq::SignalLength, JBB);
}
void
Dblqh::execCREATE_TRIG_CONF(Signal* signal)
{
jamEntry();
NodeId myNodeId = getOwnNodeId();
BlockReference dictref = calcDictBlockRef(myNodeId);
sendSignal(dictref, GSN_CREATE_TRIG_CONF, signal, CreateTrigConf::SignalLength, JBB);
sendSignal(DBDICT_REF, GSN_CREATE_TRIG_CONF, signal,
CreateTrigConf::SignalLength, JBB);
}
void
Dblqh::execCREATE_TRIG_REF(Signal* signal)
{
jamEntry();
NodeId myNodeId = getOwnNodeId();
BlockReference dictref = calcDictBlockRef(myNodeId);
sendSignal(dictref, GSN_CREATE_TRIG_REF, signal, CreateTrigRef::SignalLength, JBB);
sendSignal(DBDICT_REF, GSN_CREATE_TRIG_REF, signal,
CreateTrigRef::SignalLength, JBB);
}
void
Dblqh::execDROP_TRIG_REQ(Signal* signal)
{
jamEntry();
NodeId myNodeId = getOwnNodeId();
BlockReference tupref = calcTupBlockRef(myNodeId);
sendSignal(tupref, GSN_DROP_TRIG_REQ, signal, DropTrigReq::SignalLength, JBB);
sendSignal(DBTUP_REF, GSN_DROP_TRIG_REQ, signal,
DropTrigReq::SignalLength, JBB);
}
void
Dblqh::execDROP_TRIG_CONF(Signal* signal)
{
jamEntry();
NodeId myNodeId = getOwnNodeId();
BlockReference dictref = calcDictBlockRef(myNodeId);
sendSignal(dictref, GSN_DROP_TRIG_CONF, signal, DropTrigConf::SignalLength, JBB);
sendSignal(DBDICT_REF, GSN_DROP_TRIG_CONF, signal,
DropTrigConf::SignalLength, JBB);
}
void
Dblqh::execDROP_TRIG_REF(Signal* signal)
{
jamEntry();
NodeId myNodeId = getOwnNodeId();
BlockReference dictref = calcDictBlockRef(myNodeId);
sendSignal(dictref, GSN_DROP_TRIG_REF, signal, DropTrigRef::SignalLength, JBB);
sendSignal(DBDICT_REF, GSN_DROP_TRIG_REF, signal,
DropTrigRef::SignalLength, JBB);
}
Uint32 Dblqh::calcPageCheckSum(LogPageRecordPtr logP){

6
ndb/tools/ndb_size.pl
View file

@ -146,9 +146,9 @@ foreach(@{$tables})
elsif($type =~ /varchar/ || $type =~ /varbinary/)
{
my $fixed= 1+$size;
my @dynamic=$dbh->selectrow_array("select avg(length("
.$dbh->quote($name)
.")) from `".$table.'`');
my @dynamic=$dbh->selectrow_array("select avg(length(`"
.$name.
."`)) from `".$table.'`');
$dynamic[0]=0 if !$dynamic[0];
@realsize= ($fixed,$fixed,ceil($dynamic[0]));
}