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

Merge perch.ndb.mysql.com:/home/jonas/src/51-work

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
This commit is contained in:
unknown 2007-02-15 23:15:40 +01:00
commit 86582cbcf9
6 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file

@ -4256,7 +4256,7 @@ Dblqh::nr_copy_delete_row(Signal* signal,
signal->theData, sizeof(Local_key));
regTcPtr.p->m_nr_delete.m_page_id[pos] = RNIL;
regTcPtr.p->m_nr_delete.m_cnt = pos + 2;
ndbout << "PENDING DISK DELETE: " <<
if (0) ndbout << "PENDING DISK DELETE: " <<
regTcPtr.p->m_nr_delete.m_disk_ref[pos] << endl;
}
@ -7572,7 +7572,7 @@ void Dblqh::lqhTransNextLab(Signal* signal)
* THE RECEIVER OF THE COPY HAVE FAILED.
* WE HAVE TO CLOSE THE COPY PROCESS.
* ----------------------------------------------------------- */
ndbout_c("close copy");
if (0) ndbout_c("close copy");
tcConnectptr.p->tcNodeFailrec = tcNodeFailptr.i;
tcConnectptr.p->abortState = TcConnectionrec::NEW_FROM_TC;
closeCopyRequestLab(signal);
@ -10833,7 +10833,7 @@ void Dblqh::tupCopyCloseConfLab(Signal* signal)
void Dblqh::closeCopyRequestLab(Signal* signal)
{
scanptr.p->scanErrorCounter++;
ndbout_c("closeCopyRequestLab: scanState: %d", scanptr.p->scanState);
if (0) ndbout_c("closeCopyRequestLab: scanState: %d", scanptr.p->scanState);
switch (scanptr.p->scanState) {
case ScanRecord::WAIT_TUPKEY_COPY:
case ScanRecord::WAIT_NEXT_SCAN_COPY:

4
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
View file

@ -145,7 +145,7 @@ void Dbtup::do_tup_abortreq(Signal* signal, Uint32 flags)
{
if(copy_bits & Tuple_header::MM_GROWN)
{
ndbout_c("abort grow");
if (0) ndbout_c("abort grow");
Ptr<Page> vpage;
Uint32 idx= regOperPtr.p->m_tuple_location.m_page_idx;
Uint32 mm_vars= regTabPtr.p->m_attributes[MM].m_no_of_varsize;
@ -168,7 +168,7 @@ void Dbtup::do_tup_abortreq(Signal* signal, Uint32 flags)
}
else if(bits & Tuple_header::MM_SHRINK)
{
ndbout_c("abort shrink");
if (0) ndbout_c("abort shrink");
}
}
else if (regOperPtr.p->is_first_operation() &&

2
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
View file

@ -514,7 +514,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
c_lgman->free_log_space(regFragPtr.p->m_logfile_group_id,
regOperPtr.p->m_undo_buffer_space);
ndbout_c("insert+delete");
if (0) ndbout_c("insert+delete");
goto skip_disk;
}
}

8
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
View file

@ -2857,7 +2857,7 @@ Dbtup::handle_size_change_after_update(KeyReqStruct* req_struct,
if(needed <= alloc)
{
//ndbassert(!regOperPtr->is_first_operation());
ndbout_c(" no grow");
if (0) ndbout_c(" no grow");
return 0;
}
copy_bits |= Tuple_header::MM_GROWN;
@ -3143,7 +3143,7 @@ Dbtup::nr_delete(Signal* signal, Uint32 senderData,
break;
}
ndbout << "DIRECT DISK DELETE: " << disk << endl;
if (0) ndbout << "DIRECT DISK DELETE: " << disk << endl;
disk_page_free(signal, tablePtr.p, fragPtr.p,
&disk, *(PagePtr*)&disk_page, gci);
return 0;
@ -3195,7 +3195,7 @@ Dbtup::nr_delete_page_callback(Signal* signal,
break;
}
ndbout << "PAGE CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
if (0) ndbout << "PAGE CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
disk_page_free(signal, tablePtr.p, fragPtr.p,
&op.m_disk_ref, pagePtr, op.m_gci);
@ -3227,7 +3227,7 @@ Dbtup::nr_delete_log_buffer_callback(Signal* signal,
/**
* reset page no
*/
ndbout << "LOGBUFFER CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
if (0) ndbout << "LOGBUFFER CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
disk_page_free(signal, tablePtr.p, fragPtr.p,
&op.m_disk_ref, pagePtr, op.m_gci);

23
storage/ndb/test/run-test/main.cpp
View file

@ -239,11 +239,8 @@ main(int argc, char ** argv)
if(!stop_processes(g_config, ~0))
goto end;
if (!setup_directories(g_config, 2))
goto end;
if (!setup_files(g_config, 2, 1))
goto end;
if(!setup_hosts(g_config))
goto end;
if (!start(g_config, p_ndb | p_servers))
goto end;
@ -1070,14 +1067,14 @@ gather_result(atrt_config& config, int * result){
tmp.appfmt(" %s:%s/*",
config.m_hosts[i]->m_hostname.c_str(),
config.m_hosts[i]->m_basedir.c_str());
g_logger.debug("system(%s)", tmp.c_str());
const int r1 = system(tmp.c_str());
if(r1 != 0)
{
g_logger.critical("Failed to gather result!");
return false;
}
}
g_logger.debug("system(%s)", tmp.c_str());
const int r1 = system(tmp.c_str());
if(r1 != 0)
{
g_logger.critical("Failed to gather result!");
return false;
}
g_logger.debug("system(%s)", g_analyze_progname);

17
storage/ndb/test/src/HugoOperations.cpp
View file

@ -330,8 +330,8 @@ int HugoOperations::execute_Commit(Ndb* pNdb,
int check = 0;
check = pTrans->execute(Commit, eao);
if( check == -1 ) {
const NdbError err = pTrans->getNdbError();
const NdbError err = pTrans->getNdbError();
if( check == -1 || err.code) {
ERR(err);
NdbOperation* pOp = pTrans->getNdbErrorOperation();
if (pOp != NULL){
@ -379,13 +379,16 @@ int HugoOperations::execute_NoCommit(Ndb* pNdb, AbortOption eao){
int check;
check = pTrans->execute(NoCommit, eao);
if( check == -1 ) {
const NdbError err = pTrans->getNdbError();
const NdbError err = pTrans->getNdbError();
if( check == -1 || err.code) {
ERR(err);
NdbOperation* pOp;
while ((pOp = pTrans->getNdbErrorOperation()) != NULL){
const NdbOperation* pOp = pTrans->getNdbErrorOperation();
while (pOp != NULL)
{
const NdbError err2 = pOp->getNdbError();
ERR(err2);
if (err2.code)
ERR(err2);
pOp = pTrans->getNextCompletedOperation(pOp);
}
if (err.code == 0)
return NDBT_FAILED;