bk commit into 6.0 tree (gkodinov:1.2799)

[kgeorge]

Below is the list of changes that have just been committed into a local
6.0 repository of gkodinov.  When gkodinov 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-02-05 17:34:12+02:00, gkodinov@stripped +4 -0
  Bug 31326 
    more warnings resolved

  sql/ha_ndbcluster.cc@stripped, 2008-02-05 17:34:10+02:00, gkodinov@stripped +9 -9
    Bug 31326 
      more warnings resolved

  sql/ha_ndbcluster_binlog.h@stripped, 2008-02-05 17:34:11+02:00, gkodinov@stripped +1 -1
    Bug 31326 
      more warnings resolved

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2008-02-05 17:34:11+02:00, gkodinov@stripped +2 -2
    Bug 31326 
      more warnings resolved

  storage/ndb/src/ndbapi/Ndbinit.cpp@stripped, 2008-02-05 17:34:11+02:00, gkodinov@stripped +3 -3
    Bug 31326 
      more warnings resolved

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-12-15 16:10:02 +02:00
+++ b/sql/ha_ndbcluster.cc	2008-02-05 17:34:10 +02:00
@@ -6816,12 +6816,20 @@ ha_ndbcluster::ha_ndbcluster(handlerton 
   m_thd_ndb(NULL),
   m_active_cursor(NULL),
   m_table(NULL),
+  m_ndb_record(0),
+  m_ndb_record_fragment(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),
+  m_row_buffer(0),
+  m_row_buffer_size(0),
+  m_row_buffer_current(NULL),
+  m_extra_reclength(0),
   m_part_info(NULL),
-  m_use_partition_pruning(FALSE),
   m_user_defined_partitioning(FALSE),
+  m_use_partition_pruning(FALSE),
   m_sorted(FALSE),
   m_use_write(FALSE),
   m_ignore_dup_key(FALSE),
@@ -6833,17 +6841,9 @@ ha_ndbcluster::ha_ndbcluster(handlerton 
   m_delete_cannot_batch(FALSE),
   m_update_cannot_batch(FALSE),
   m_skip_auto_increment(TRUE),
-  m_row_buffer_current(NULL),
   m_blobs_pending(0),
   m_blobs_buffer(0),
   m_blobs_buffer_size(0),
-  m_row_buffer(0),
-  m_row_buffer_size(0),
-  m_extra_reclength(0),
-  m_ndb_record(0),
-  m_ndb_record_fragment(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/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h
--- a/sql/ha_ndbcluster_binlog.h	2007-11-21 02:24:36 +02:00
+++ b/sql/ha_ndbcluster_binlog.h	2008-02-05 17:34:11 +02:00
@@ -40,7 +40,7 @@ class Ndb_event_data
 {
 public:
   Ndb_event_data(NDB_SHARE *the_share) : 
-    share(the_share), table_share((TABLE_SHARE *)0), table((TABLE *)0)
+    table_share((TABLE_SHARE *)0), table((TABLE *)0), share(the_share)
   {
     ndb_value[0]= 0;
     ndb_value[1]= 0;
diff -Nrup a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-12-11 17:05:16 +02:00
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-02-05 17:34:11 +02:00
@@ -1041,10 +1041,10 @@ NdbEventOperationImpl::printAll()
 
 NdbEventBuffer::NdbEventBuffer(Ndb *ndb) :
   m_system_nodes(ndb->theImpl->theNoOfDBnodes),
-  m_ndb(ndb),
-  m_latestGCI(0), m_latest_complete_GCI(0),
   m_min_gci_index(0),
   m_max_gci_index(0),
+  m_ndb(ndb),
+  m_latestGCI(0), m_latest_complete_GCI(0),
   m_total_alloc(0),
   m_free_thresh(10),
   m_min_free_thresh(10),
diff -Nrup a/storage/ndb/src/ndbapi/Ndbinit.cpp b/storage/ndb/src/ndbapi/Ndbinit.cpp
--- a/storage/ndb/src/ndbapi/Ndbinit.cpp	2007-03-07 13:14:20 +02:00
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp	2008-02-05 17:34:11 +02: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,9 +205,7 @@ NdbImpl::NdbImpl(Ndb_cluster_connection 
     theNdbObjectIdMap(m_transporter_facade->theMutexPtr,
 		      1024,1024),
     theNoOfDBnodes(0),
-    m_ev_op(0),
-    m_next_ndb_object(0),
-    m_prev_ndb_object(0)
+    m_ev_op(0)
 {
   int i;
   for (i = 0; i < MAX_NDB_NODES; i++) {