diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-06-25 07:14:21 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-06-25 07:14:21 +0200 |
| commit | ea88a770eaef8c7aa044dc095343a723cd6d5749 (patch) | |
| tree | bae15acf6231f256ea87e4a6454ef1b00c971c22 /storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp | |
| parent | 6b25b945b19a7638b0538e04de4f72991f353356 (diff) | |
| parent | 5201c499d26300b4e5ce339f34d00e8f102d6e99 (diff) | |
| download | mariadb-git-ea88a770eaef8c7aa044dc095343a723cd6d5749.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
Diffstat (limited to 'storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp index 4e4c553ea6c..b801e14104a 100644 --- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp +++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp @@ -1585,7 +1585,8 @@ public: ACTIVE_WRITE_LOG = 17, ///< A write operation during ///< writing of log READ_SR_INVALIDATE_PAGES = 18, - WRITE_SR_INVALIDATE_PAGES = 19 + WRITE_SR_INVALIDATE_PAGES = 19, + WRITE_SR_INVALIDATE_PAGES_UPDATE_PAGE0 = 20 }; /** * We have to remember the log pages read. @@ -2381,7 +2382,7 @@ private: void errorReport(Signal* signal, int place); void warningReport(Signal* signal, int place); void invalidateLogAfterLastGCI(Signal *signal); - void readFileInInvalidate(Signal *signal); + void readFileInInvalidate(Signal *signal, bool stepNext); void exitFromInvalidate(Signal* signal); Uint32 calcPageCheckSum(LogPageRecordPtr logP); Uint32 handleLongTupKey(Signal* signal, Uint32* dataPtr, Uint32 len); |