4079 Frazer Clement 2012-11-09 [merge]
Merge 7.1->7.2
modified:
storage/ndb/src/kernel/blocks/backup/Backup.cpp
4078 Ole John Aske 2012-11-08 [merge]
Merge 7.1 -> 7.2
modified:
storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/backup/Backup.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp 2012-11-07 18:00:23 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp 2012-11-09 14:37:51 +0000
@@ -6041,15 +6041,6 @@ Backup::execLCP_STATUS_REQ(Signal* signa
FragmentPtr fragPtr;
BackupFilePtr filePtr;
- ptr.p->tables.first(tabPtr);
- if (tabPtr.i == RNIL)
- {
- jam();
- failCode = LcpStatusRef::NoTableRecord;
- break;
- }
- tabPtr.p->fragments.getPtr(fragPtr, 0);
- ndbrequire(fragPtr.p->tableId == tabPtr.p->tableId);
if (ptr.p->dataFilePtr == RNIL)
{
jam();
@@ -6058,8 +6049,16 @@ Backup::execLCP_STATUS_REQ(Signal* signa
}
c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
ndbrequire(filePtr.p->backupPtr == ptr.i);
- conf->tableId = tabPtr.p->tableId;
- conf->fragId = fragPtr.p->fragmentId;
+
+ ptr.p->tables.first(tabPtr);
+ if (tabPtr.i != RNIL)
+ {
+ jam();
+ tabPtr.p->fragments.getPtr(fragPtr, 0);
+ ndbrequire(fragPtr.p->tableId == tabPtr.p->tableId);
+ conf->tableId = tabPtr.p->tableId;
+ conf->fragId = fragPtr.p->fragmentId;
+ }
if (state == LcpStatusConf::LCP_SCANNING)
{
No bundle (reason: useless for push emails).
Thread |
---|
• bzr push into mysql-5.5-cluster-7.2 branch (frazer.clement:4078 to 4079) | Frazer Clement | 12 Nov |