Commit 4230b1b5 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/50-ndb
parents 7bf78e09 0c03b509

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

+8 −6
Original line number Diff line number Diff line
@@ -374,15 +374,17 @@ Backup::execCONTINUEB(Signal* signal) 
    ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);

    FsBuffer & buf = filePtr.p->operation.dataBuffer;

    

    if(buf.getFreeSize() + buf.getMinRead() < buf.getUsableSize()) {

    if(buf.getFreeSize() < buf.getMaxWrite()) {

      jam();

      TablePtr tabPtr LINT_SET_PTR;

      c_tablePool.getPtr(tabPtr, Tdata2);

      

      DEBUG_OUT("Backup - Buffer full - " << buf.getFreeSize()

		<< " + " << buf.getMinRead()

		<< " < " << buf.getUsableSize()

		<< " - tableId = " << tabPtr.p->tableId);

      DEBUG_OUT("Backup - Buffer full - " 

                << buf.getFreeSize()

		<< " < " << buf.getMaxWrite()

                << " (sz: " << buf.getUsableSize()

                << " getMinRead: " << buf.getMinRead()

		<< ") - tableId = " << tabPtr.p->tableId);

      

      signal->theData[0] = BackupContinueB::BUFFER_FULL_META;

      signal->theData[1] = Tdata1;

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

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ public: 
  Uint32 m_diskless;



  STATIC_CONST(NO_OF_PAGES_META_FILE = 

	       (MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) / 

	       (2*MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) / 

	       BACKUP_WORDS_PER_PAGE);

  

  /**