bk commit into 5.1 tree (gkodinov:1.2643) BUG#31326

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-14 15:21:37+02:00, gkodinov@stripped +5 -0
  Bug #31326: No compile check of order of initializations
   fixed -Wreorder warnings

  BUILD/SETUP.sh@stripped, 2007-12-14 15:21:33+02:00, gkodinov@stripped +4 -2
    Bug #31326: enabled the -Wreorder warnings

  sql/rpl_mi.cc@stripped, 2007-12-14 15:21:33+02:00, gkodinov@stripped +2 -2
    Bug #31326: fixed -Wreorder warnings

  storage/heap/ha_heap.cc@stripped, 2007-12-14 15:21:34+02:00, gkodinov@stripped +2 -2
    Bug #31326: fixed -Wreorder warnings

  storage/ndb/src/kernel/blocks/backup/Backup.hpp@stripped, 2007-12-14 15:21:34+02:00,
gkodinov@stripped +2 -1
    Bug #31326: fixed -Wreorder warnings

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-12-14 15:21:34+02:00,
gkodinov@stripped +2 -2
    Bug #31326: fixed -Wreorder warnings

diff -Nrup a/BUILD/SETUP.sh b/BUILD/SETUP.sh
--- a/BUILD/SETUP.sh	2007-08-30 20:19:00 +03:00
+++ b/BUILD/SETUP.sh	2007-12-14 15:21:33 +02:00
@@ -100,8 +100,10 @@ if [ "x$warning_mode" != "xpedantic" ]; 
 # C warnings
   c_warnings="$warnings -Wunused-parameter"
 # C++ warnings
-  cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder"
-  cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
+  cxx_warnings="$warnings"
+# cxx_warnings="$cxx_warnings -Woverloaded-virtual -Wsign-promo"
+  cxx_warnings="$cxx_warnings -Wreorder"
+  cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
 # Added unless --with-debug=full
   debug_extra_cflags="-O1 -Wuninitialized"
 else
diff -Nrup a/sql/rpl_mi.cc b/sql/rpl_mi.cc
--- a/sql/rpl_mi.cc	2007-08-16 09:52:43 +03:00
+++ b/sql/rpl_mi.cc	2007-12-14 15:21:33 +02:00
@@ -29,9 +29,9 @@ int init_strvar_from_file(char *var, int
 
 Master_info::Master_info()
   :Slave_reporting_capability("I/O"),
-   ssl(0), fd(-1),  io_thd(0), inited(0),
+   ssl(0), ssl_verify_server_cert(0), fd(-1), io_thd(0), inited(0),
    abort_slave(0),slave_running(0),
-   ssl_verify_server_cert(0), slave_run_id(0)
+   slave_run_id(0)
 {
   host[0] = 0; user[0] = 0; password[0] = 0;
   ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;
diff -Nrup a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
--- a/storage/heap/ha_heap.cc	2007-10-23 14:32:35 +03:00
+++ b/storage/heap/ha_heap.cc	2007-12-14 15:21:34 +02:00
@@ -61,8 +61,8 @@ static handler *heap_create_handler(hand
 *****************************************************************************/
 
 ha_heap::ha_heap(handlerton *hton, TABLE_SHARE *table_arg)
-  :handler(hton, table_arg), file(0), records_changed(0), internal_table(0),
-   key_stat_version(0)
+  :handler(hton, table_arg), file(0), records_changed(0), key_stat_version(0), 
+  internal_table(0)
 {}
 
 
diff -Nrup a/storage/ndb/src/kernel/blocks/backup/Backup.hpp
b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
--- a/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2007-06-05 18:29:32 +03:00
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2007-12-14 15:21:34 +02:00
@@ -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 -Nrup a/storage/ndb/src/kernel/blocks/pgman.cpp
b/storage/ndb/src/kernel/blocks/pgman.cpp
--- a/storage/ndb/src/kernel/blocks/pgman.cpp	2007-10-08 17:05:26 +03:00
+++ b/storage/ndb/src/kernel/blocks/pgman.cpp	2007-12-14 15:21:34 +02:00
@@ -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()
 {