Commit 853cf3da authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents 6011ad78 b6e908ca
...@@ -4860,7 +4860,7 @@ Backup::lcp_open_file(Signal* signal, BackupRecordPtr ptr) ...@@ -4860,7 +4860,7 @@ Backup::lcp_open_file(Signal* signal, BackupRecordPtr ptr)
c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr); c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
ndbrequire(filePtr.p->m_flags == 0); ndbrequire(filePtr.p->m_flags == 0);
filePtr.p->m_flags |= BackupFile::BF_OPENING; filePtr.p->m_flags |= BackupFile::BF_OPENING;
filePtr.p->tableId = RNIL; // Will force init
req->userPointer = filePtr.i; req->userPointer = filePtr.i;
FsOpenReq::setVersion(req->fileNumber, 5); FsOpenReq::setVersion(req->fileNumber, 5);
FsOpenReq::setSuffix(req->fileNumber, FsOpenReq::S_DATA); FsOpenReq::setSuffix(req->fileNumber, FsOpenReq::S_DATA);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment