summaryrefslogtreecommitdiff
path: root/storage/ndb/src/kernel/blocks
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@macbook.gmz>2007-12-14 15:21:37 +0200
committerunknown <gkodinov/kgeorge@macbook.gmz>2007-12-14 15:21:37 +0200
commit763c1132c3a2b6352cd199ad17e1a121672c5740 (patch)
tree6682c1b590553e4556b970ac5bc9edec08ea1241 /storage/ndb/src/kernel/blocks
parent0cc269da52f939ffc6a6272370d113aac9ab5369 (diff)
downloadmariadb-git-763c1132c3a2b6352cd199ad17e1a121672c5740.tar.gz
Bug #31326: No compile check of order of initializations
fixed -Wreorder warnings BUILD/SETUP.sh: Bug #31326: enabled the -Wreorder warnings sql/rpl_mi.cc: Bug #31326: fixed -Wreorder warnings storage/heap/ha_heap.cc: Bug #31326: fixed -Wreorder warnings storage/ndb/src/kernel/blocks/backup/Backup.hpp: Bug #31326: fixed -Wreorder warnings storage/ndb/src/kernel/blocks/pgman.cpp: Bug #31326: fixed -Wreorder warnings
Diffstat (limited to 'storage/ndb/src/kernel/blocks')
-rw-r--r--storage/ndb/src/kernel/blocks/backup/Backup.hpp3
-rw-r--r--storage/ndb/src/kernel/blocks/pgman.cpp4
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()
{