Commit 4bd0ac3a authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

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


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/run-test/main.cpp:
  Auto merged
parents 02c6bc38 86582cbc

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

+3 −3
Original line number Diff line number Diff line
@@ -4257,7 +4257,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;

  }
@@ -7573,7 +7573,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);
@@ -10834,7 +10834,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:

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

+2 −2
Original line number Diff line number Diff line
@@ -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() &&

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

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

      }

    }

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

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

storage/ndb/test/run-test/main.cpp

+10 −13
Original line number Diff line number Diff line
@@ -239,10 +239,7 @@ 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))

      if(!setup_hosts(g_config))

        goto end;

      

      if (!start(g_config, p_ndb | p_servers))
@@ -1070,6 +1067,7 @@ 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());
@@ -1078,7 +1076,6 @@ gather_result(atrt_config& config, int * result){ 
    g_logger.critical("Failed to gather result!");

    return false;

  }

  }

  

  g_logger.debug("system(%s)", g_analyze_progname);

  const int r2 = system(g_analyze_progname);