diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-06-25 07:18:00 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-06-25 07:18:00 +0200 |
| commit | 56c68a47314cc86afc75dc71e6ebb2bce9bd29f5 (patch) | |
| tree | e609fdbba10a4af1bdf9694ab5f6800591adb80a /storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp | |
| parent | 98a0b4521315b146aa81c77a26a7bf61fc6f13b5 (diff) | |
| parent | ea88a770eaef8c7aa044dc095343a723cd6d5749 (diff) | |
| download | mariadb-git-56c68a47314cc86afc75dc71e6ebb2bce9bd29f5.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
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 64d214d472b..6f8e5569831 100644 --- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp +++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp @@ -1586,7 +1586,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); |