diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2008-01-30 08:10:37 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2008-01-30 08:10:37 +0100 |
| commit | 950e7854440339b443742eeb5597c4c930f3ee4a (patch) | |
| tree | 19375d6cb5e2ccd0fb8b2bc2de275a546b475c0b /ndb | |
| parent | 507c8a1374c7c10900d2e84c3146fe9bb777cf81 (diff) | |
| parent | 6c19c971b618e2e9d9728de2345e08e1ca231fa7 (diff) | |
| download | mariadb-git-950e7854440339b443742eeb5597c4c930f3ee4a.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into perch.ndb.mysql.com:/home/jonas/src/50-ndb
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/backup/Backup.cpp | 14 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/backup/Backup.hpp | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/ndb/src/kernel/blocks/backup/Backup.cpp b/ndb/src/kernel/blocks/backup/Backup.cpp index 70721bfca56..52ab11b8388 100644 --- a/ndb/src/kernel/blocks/backup/Backup.cpp +++ b/ndb/src/kernel/blocks/backup/Backup.cpp @@ -374,16 +374,18 @@ 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; signal->theData[2] = Tdata2; diff --git a/ndb/src/kernel/blocks/backup/Backup.hpp b/ndb/src/kernel/blocks/backup/Backup.hpp index 8b0c27727b0..e67d8f09f0e 100644 --- a/ndb/src/kernel/blocks/backup/Backup.hpp +++ b/ndb/src/kernel/blocks/backup/Backup.hpp @@ -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); /** |