bk commit into 5.1 tree (frazer:1.2572)

[Frazer Clement]

Below is the list of changes that have just been committed into a local
5.1 repository of frazer.  When frazer 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, 2008-03-26 13:22:30+00:00, frazer@stripped +4 -0
  Missed constructor member init order fixes

  sql/ha_ndbcluster.cc@stripped, 2008-03-26 13:22:12+00:00, frazer@stripped +2 -2
    Missed constructor member init order fixes

  storage/ndb/src/ndbapi/Ndbinit.cpp@stripped, 2008-03-26 13:22:15+00:00, frazer@stripped +2 -2
    Missed constructor member init order fixes

  storage/ndb/test/src/DbUtil.cpp@stripped, 2008-03-26 13:22:17+00:00, frazer@stripped +5 -5
    Missed constructor member init order fixes

  storage/ndb/test/src/NdbRestarter.cpp@stripped, 2008-03-26 13:22:19+00:00, frazer@stripped +1 -1
    Missed constructor member init order fixes

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2008-03-26 12:14:56 +00:00
+++ b/sql/ha_ndbcluster.cc	2008-03-26 13:22:12 +00:00
@@ -6431,6 +6431,8 @@ ha_ndbcluster::ha_ndbcluster(handlerton 
   m_active_cursor(NULL),
   m_table(NULL),
   m_ndb_record(0),
+  m_ndb_hidden_key_record(0),
+  m_ndb_statistics_record(0),
   m_table_info(NULL),
   m_table_flags(HA_NDBCLUSTER_TABLE_FLAGS),
   m_share(0),
@@ -6451,8 +6453,6 @@ ha_ndbcluster::ha_ndbcluster(handlerton 
   m_blobs_pending(0),
   m_blobs_buffer(0),
   m_blobs_buffer_size(0),
-  m_ndb_hidden_key_record(0),
-  m_ndb_statistics_record(0),
   m_dupkey((uint) -1),
   m_force_send(TRUE),
   m_autoincrement_prefetch((ha_rows) NDB_DEFAULT_AUTO_PREFETCH),
diff -Nrup a/storage/ndb/src/ndbapi/Ndbinit.cpp b/storage/ndb/src/ndbapi/Ndbinit.cpp
--- a/storage/ndb/src/ndbapi/Ndbinit.cpp	2008-03-26 11:50:43 +00:00
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp	2008-03-26 13:22:15 +00:00
@@ -196,6 +196,8 @@ NdbWaiter::~NdbWaiter(){
 NdbImpl::NdbImpl(Ndb_cluster_connection *ndb_cluster_connection,
 		 Ndb& ndb)
   : m_ndb(ndb),
+    m_next_ndb_object(0),
+    m_prev_ndb_object(0),
     m_ndb_cluster_connection(ndb_cluster_connection->m_impl),
     m_transporter_facade(ndb_cluster_connection->m_impl.m_transporter_facade),
     m_dictionary(ndb),
@@ -203,8 +205,6 @@ NdbImpl::NdbImpl(Ndb_cluster_connection 
     theNdbObjectIdMap(m_transporter_facade->theMutexPtr,
 		      1024,1024),
     theNoOfDBnodes(0),
-    m_next_ndb_object(0),
-    m_prev_ndb_object(0),
     m_ev_op(0)
 {
   int i;
diff -Nrup a/storage/ndb/test/src/DbUtil.cpp b/storage/ndb/test/src/DbUtil.cpp
--- a/storage/ndb/test/src/DbUtil.cpp	2008-03-03 15:10:39 +00:00
+++ b/storage/ndb/test/src/DbUtil.cpp	2008-03-26 13:22:17 +00:00
@@ -23,12 +23,12 @@
 
 DbUtil::DbUtil(const char* _dbname,
                const char* _suffix):
+  m_mysql(NULL),
+  m_free_mysql(true),
   m_connected(false),
   m_user("root"),
   m_pass(""),
-  m_dbname(_dbname),
-  m_mysql(NULL),
-  m_free_mysql(true)
+  m_dbname(_dbname)
 {
   const char* env= getenv("MYSQL_HOME");
   if (env && strlen(env))
@@ -50,9 +50,9 @@ DbUtil::DbUtil(const char* _dbname,
 
 
 DbUtil::DbUtil(MYSQL* mysql):
-  m_connected(true),
   m_mysql(mysql),
-  m_free_mysql(false)
+  m_free_mysql(false),
+  m_connected(true)
 {
 }
 
diff -Nrup a/storage/ndb/test/src/NdbRestarter.cpp b/storage/ndb/test/src/NdbRestarter.cpp
--- a/storage/ndb/test/src/NdbRestarter.cpp	2008-02-21 13:57:39 +00:00
+++ b/storage/ndb/test/src/NdbRestarter.cpp	2008-03-26 13:22:19 +00:00
@@ -32,8 +32,8 @@
 
 
 NdbRestarter::NdbRestarter(const char* _addr): 
-  connected(false),
   handle(NULL),
+  connected(false),
   m_config(0),
   m_reconnect(false)
 {