Commit 82fde89c authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


support-files/mysql.spec.sh:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
parents 28a5775b 748b5ce3

storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp

+12 −0
Original line number Diff line number Diff line
@@ -262,6 +262,18 @@ Dbdih::Dbdih(const class Configuration & config): 


  addRecSignal(GSN_CREATE_FRAGMENTATION_REQ, 

	       &Dbdih::execCREATE_FRAGMENTATION_REQ);



  apiConnectRecord = 0;  

  connectRecord = 0;  

  fileRecord = 0;  

  fragmentstore = 0;

  pageRecord = 0;  

  replicaRecord = 0;  

  tabRecord = 0;

  createReplicaRecord = 0;  

  nodeGroupRecord = 0;  

  nodeRecord = 0;

  takeOverRecord = 0;

}//Dbdih::Dbdih()



Dbdih::~Dbdih()

storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp

+13 −0
Original line number Diff line number Diff line
@@ -291,6 +291,19 @@ Dbtc::Dbtc(const class Configuration & conf): 
  

  addRecSignal(GSN_ALTER_TAB_REQ, &Dbtc::execALTER_TAB_REQ);



  cacheRecord = 0;

  apiConnectRecord = 0;

  tcConnectRecord = 0;

  hostRecord = 0;

  tableRecord = 0;

  scanRecord = 0;

  databufRecord = 0;

  attrbufRecord = 0;

  gcpRecord = 0;

  tcFailRecord = 0;

  c_apiConTimer = 0;

  c_apiConTimer_line = 0;



#ifdef VM_TRACE

  {

    void* tmp[] = { &apiConnectptr,

storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp

+16 −0
Original line number Diff line number Diff line
@@ -126,6 +126,22 @@ Dbtup::Dbtup(const class Configuration & conf) 
  addRecSignal(GSN_ACC_CHECK_SCAN, &Dbtup::execACC_CHECK_SCAN);



  initData();



  attrbufrec = 0;  

  checkpointInfo = 0;  

  diskBufferSegmentInfo = 0;  

  fragoperrec = 0;

  fragrecord = 0;  

  hostBuffer = 0;  

  localLogInfo = 0;  

  operationrec = 0;

  page = 0;  

  pageRange = 0;

  pendingFileOpenInfo = 0;  

  restartInfoRecord = 0;  

  tablerec = 0;  

  tableDescriptor = 0;  

  undoPage = 0;

}//Dbtup::Dbtup()



Dbtup::~Dbtup()

storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp

+4 −1
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ Ndbfs::Ndbfs(const Configuration & conf) : 
  addRecSignal(GSN_FSAPPENDREQ, &Ndbfs::execFSAPPENDREQ);

  addRecSignal(GSN_FSREMOVEREQ, &Ndbfs::execFSREMOVEREQ);

   // Set send signals



  theRequestPool = 0;

}



Ndbfs::~Ndbfs()
@@ -85,6 +87,7 @@ Ndbfs::~Ndbfs() 
  }//for

  theFiles.clear();



  if (theRequestPool)

    delete theRequestPool;

}

support-files/mysql.spec.sh

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ fi 
%defattr(-, root, root, 0755)

%attr(-, root, root) %{_datadir}/sql-bench

%attr(-, root, root) %{_datadir}/mysql-test

%attr(755, rott, root) %{_bindir}/mysql_client_test

%attr(755, root, root) %{_bindir}/mysql_client_test

%attr(755, root, root) %{_bindir}/mysqltestmanager

%attr(755, root, root) %{_bindir}/mysqltestmanager-pwgen

%attr(755, root, root) %{_bindir}/mysqltestmanagerc