1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2005-10-10 19:15:42 +02:00
commit d9b59517fd
5 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
View File

@ -262,6 +262,18 @@ Dbdih::Dbdih(const class Configuration & config):
addRecSignal(GSN_CREATE_FRAGMENTATION_REQ, addRecSignal(GSN_CREATE_FRAGMENTATION_REQ,
&Dbdih::execCREATE_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()
Dbdih::~Dbdih() Dbdih::~Dbdih()

13
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
View File

@ -291,6 +291,19 @@ Dbtc::Dbtc(const class Configuration & conf):
addRecSignal(GSN_ALTER_TAB_REQ, &Dbtc::execALTER_TAB_REQ); 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 #ifdef VM_TRACE
{ {
void* tmp[] = { &apiConnectptr, void* tmp[] = { &apiConnectptr,

16
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
View File

@ -126,6 +126,22 @@ Dbtup::Dbtup(const class Configuration & conf)
addRecSignal(GSN_ACC_CHECK_SCAN, &Dbtup::execACC_CHECK_SCAN); addRecSignal(GSN_ACC_CHECK_SCAN, &Dbtup::execACC_CHECK_SCAN);
initData(); 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()
Dbtup::~Dbtup() Dbtup::~Dbtup()

3
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
View File

@ -71,6 +71,8 @@ Ndbfs::Ndbfs(const Configuration & conf) :
addRecSignal(GSN_FSAPPENDREQ, &Ndbfs::execFSAPPENDREQ); addRecSignal(GSN_FSAPPENDREQ, &Ndbfs::execFSAPPENDREQ);
addRecSignal(GSN_FSREMOVEREQ, &Ndbfs::execFSREMOVEREQ); addRecSignal(GSN_FSREMOVEREQ, &Ndbfs::execFSREMOVEREQ);
// Set send signals // Set send signals
theRequestPool = 0;
} }
Ndbfs::~Ndbfs() Ndbfs::~Ndbfs()
@ -85,6 +87,7 @@ Ndbfs::~Ndbfs()
}//for }//for
theFiles.clear(); theFiles.clear();
if (theRequestPool)
delete theRequestPool; delete theRequestPool;
} }

2
support-files/mysql.spec.sh
View File

@ -650,7 +650,7 @@ fi
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%attr(-, root, root) %{_datadir}/sql-bench %attr(-, root, root) %{_datadir}/sql-bench
%attr(-, root, root) %{_datadir}/mysql-test %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
%attr(755, root, root) %{_bindir}/mysqltestmanager-pwgen %attr(755, root, root) %{_bindir}/mysqltestmanager-pwgen
%attr(755, root, root) %{_bindir}/mysqltestmanagerc %attr(755, root, root) %{_bindir}/mysqltestmanagerc