bzr push into mysql-5.5-cluster branch (magnus.blaudd:3631 to 3634)

[Magnus Blåudd]

 3634 Magnus Blåudd	2011-10-27
      ndbcluster
       - forward portability fix, remove use of COND in favor of Item

    modified:
      sql/ha_ndbcluster_connection.cc
 3633 Magnus Blåudd	2011-10-27
      ndbcluster
       - make the share memeber of Ndb_tuple_id_range_guard private

    modified:
      sql/ha_ndbcluster.cc
 3632 Magnus Blåudd	2011-10-27
      ndbcluster
       - move Ndb_tuple_id_range_guard into the only file where it's used

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
 3631 Magnus Blåudd	2011-10-27
      ndbcluster
       - move Ndb_binlog_extra_row_info to it's own file

    added:
      sql/ndb_binlog_extra_row_info.cc
      sql/ndb_binlog_extra_row_info.h
    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      storage/ndb/CMakeLists.txt
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-10-27 09:34:06 +0000
+++ b/sql/ha_ndbcluster.cc	2011-10-27 11:57:04 +0000
@@ -4294,6 +4294,24 @@ ha_ndbcluster::set_auto_inc(THD *thd, Fi
   DBUG_RETURN(set_auto_inc_val(thd, next_val));
 }
 
+
+class Ndb_tuple_id_range_guard {
+  NDB_SHARE* m_share;
+public:
+  Ndb_tuple_id_range_guard(NDB_SHARE* share) :
+    m_share(share),
+    range(share->tuple_id_range)
+  {
+    pthread_mutex_lock(&m_share->mutex);
+  }
+  ~Ndb_tuple_id_range_guard()
+  {
+    pthread_mutex_unlock(&m_share->mutex);
+  }
+  Ndb::TupleIdRange& range;
+};
+
+
 inline
 int
 ha_ndbcluster::set_auto_inc_val(THD *thd, Uint64 value)

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-10-27 08:50:09 +0000
+++ b/sql/ha_ndbcluster.h	2011-10-27 11:48:43 +0000
@@ -111,19 +111,6 @@ public:
 #include "ndb_ndbapi_util.h"
 #include "ndb_share.h"
 
-struct Ndb_tuple_id_range_guard {
-  Ndb_tuple_id_range_guard(NDB_SHARE* _share) :
-    share(_share),
-    range(share->tuple_id_range) {
-    pthread_mutex_lock(&share->mutex);
-  }
-  ~Ndb_tuple_id_range_guard() {
-    pthread_mutex_unlock(&share->mutex);
-  }
-  NDB_SHARE* share;
-  Ndb::TupleIdRange& range;
-};
-
 enum enum_slave_trans_conflict_apply_state
 {
   /* Normal with optional row-level conflict detection */

=== modified file 'sql/ha_ndbcluster_connection.cc'
--- a/sql/ha_ndbcluster_connection.cc	2011-10-23 07:47:05 +0000
+++ b/sql/ha_ndbcluster_connection.cc	2011-10-27 12:04:20 +0000
@@ -341,7 +341,8 @@ static ST_FIELD_INFO ndb_transid_mysql_c
 
 static
 int
-ndb_transid_mysql_connection_map_fill_table(THD* thd, TABLE_LIST* tables, COND* cond)
+ndb_transid_mysql_connection_map_fill_table(THD* thd, TABLE_LIST* tables,
+                                            Item*)
 {
   DBUG_ENTER("ndb_transid_mysql_connection_map_fill_table");
 

No bundle (reason: useless for push emails).