Commit 5b6a0064 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents d447f881 a2c7b2a6

ndb/src/kernel/blocks/backup/Backup.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+9 −5
Original line number Diff line number Diff line
@@ -11087,7 +11087,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);
@@ -11675,14 +11679,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();
@@ -11690,7 +11694,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);

      }

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+12 −18
Original line number Diff line number Diff line
@@ -18562,60 +18562,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){

























ndb/tools/ndb_size.pl



+3
−3






























Original line number
Diff line number
Diff line







@@ -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]));









	}