Commit ed1e0b08 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 a13d114d 7e9b2ef9
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -345,10 +345,16 @@ public: ...@@ -345,10 +345,16 @@ public:
Uint32 nextList; Uint32 nextList;
union { Uint32 prevList; Uint32 nextPool; }; union { Uint32 prevList; Uint32 nextPool; };
Uint8 fileOpened; enum {
Uint8 fileRunning; BF_OPEN = 0x1
Uint8 fileClosing; ,BF_OPENING = 0x2
Uint8 scanRunning; ,BF_CLOSING = 0x4
,BF_FILE_THREAD = 0x8
,BF_SCAN_THREAD = 0x10
,BF_LCP_META = 0x20
};
Uint32 m_flags;
Uint32 m_pos;
}; };
typedef Ptr<BackupFile> BackupFilePtr; typedef Ptr<BackupFile> BackupFilePtr;
...@@ -357,14 +363,14 @@ public: ...@@ -357,14 +363,14 @@ public:
* State for BackupRecord * State for BackupRecord
*/ */
enum State { enum State {
INITIAL, INITIAL = 0,
DEFINING, // Defining backup content and parameters DEFINING = 1, // Defining backup content and parameters
DEFINED, // DEFINE_BACKUP_CONF sent in slave, received all in master DEFINED = 2, // DEFINE_BACKUP_CONF sent in slave, received all in master
STARTED, // Creating triggers STARTED = 3, // Creating triggers
SCANNING, // Scanning fragments SCANNING = 4, // Scanning fragments
STOPPING, // Closing files STOPPING = 5, // Closing files
CLEANING, // Cleaning resources CLEANING = 6, // Cleaning resources
ABORTING // Aborting backup ABORTING = 7 // Aborting backup
}; };
static const Uint32 validSlaveTransitionsCount; static const Uint32 validSlaveTransitionsCount;
......
...@@ -212,8 +212,6 @@ inline ...@@ -212,8 +212,6 @@ inline
void void
FsBuffer::reset() FsBuffer::reset()
{ {
assert(m_free = m_size);
assert(m_readIndex == m_writeIndex);
m_readIndex = m_writeIndex = 0; m_readIndex = m_writeIndex = 0;
m_free = m_size; m_free = m_size;
m_eof = 0; m_eof = 0;
......
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