diff options
author | unknown <gkodinov/kgeorge@macbook.gmz> | 2008-01-30 13:37:57 +0200 |
---|---|---|
committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2008-01-30 13:37:57 +0200 |
commit | 7650ce4b8178c1311ee291020398c1c174139391 (patch) | |
tree | b8bbc37c561b16a22b351f193c7b49b10247bb5e /storage/ndb | |
parent | 7b71c46f1207733126ac4fb0607968204f2be6c4 (diff) | |
parent | 763c1132c3a2b6352cd199ad17e1a121672c5740 (diff) | |
download | mariadb-git-7650ce4b8178c1311ee291020398c1c174139391.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B31326-merge-5.1-opt
Diffstat (limited to 'storage/ndb')
-rw-r--r-- | storage/ndb/src/kernel/blocks/backup/Backup.hpp | 3 | ||||
-rw-r--r-- | storage/ndb/src/kernel/blocks/pgman.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.hpp b/storage/ndb/src/kernel/blocks/backup/Backup.hpp index 3fd9b2967fd..a84462cd900 100644 --- a/storage/ndb/src/kernel/blocks/backup/Backup.hpp +++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp @@ -425,8 +425,9 @@ public: ArrayPool<TriggerRecord> & trp) : slaveState(b, validSlaveTransitions, validSlaveTransitionsCount,1) , tables(tp), triggers(trp), files(bp) - , masterData(b), backup(b) , ctlFilePtr(RNIL), logFilePtr(RNIL), dataFilePtr(RNIL) + , masterData(b), backup(b) + { } diff --git a/storage/ndb/src/kernel/blocks/pgman.cpp b/storage/ndb/src/kernel/blocks/pgman.cpp index aa1f04c720c..21295944eab 100644 --- a/storage/ndb/src/kernel/blocks/pgman.cpp +++ b/storage/ndb/src/kernel/blocks/pgman.cpp @@ -259,14 +259,14 @@ Pgman::execCONTINUEB(Signal* signal) // page entry Pgman::Page_entry::Page_entry(Uint32 file_no, Uint32 page_no) : - m_state(0), m_file_no(file_no), + m_state(0), m_page_no(page_no), m_real_page_i(RNIL), - m_copy_page_i(RNIL), m_lsn(0), m_last_lcp(0), m_dirty_count(0), + m_copy_page_i(RNIL), m_busy_count(0), m_requests() { |