diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2008-01-30 12:52:55 +0100 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2008-01-30 12:52:55 +0100 |
commit | b6d3eac082e2bdd8087f3291d408168c78d1bffe (patch) | |
tree | 150701dd10e1546fd345800dd5cb55aea6aab7da /storage/ndb/src/kernel/blocks/backup/Backup.cpp | |
parent | b75ae0f3f4e375e6cc9e485b228f3cc8fa167a22 (diff) | |
parent | d132dd6299e03e9afe35638ba1bcca5ddb24ba44 (diff) | |
download | mariadb-git-b6d3eac082e2bdd8087f3291d408168c78d1bffe.tar.gz |
Merge perch.ndb.mysql.com:/home/jonas/src/50-ndb
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/vm/DLHashTable.hpp:
Auto merged
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
merge
Diffstat (limited to 'storage/ndb/src/kernel/blocks/backup/Backup.cpp')
-rw-r--r-- | storage/ndb/src/kernel/blocks/backup/Backup.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp index ec7b3f42374..5cc486ff83b 100644 --- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp +++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp @@ -326,16 +326,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; |