From: magnus.blaudd
Date: October 31 2011 9:26am
Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3620 to 3621)
List-Archive: http://lists.mysql.com/commits/141669
Message-Id: <201110310926.p9V9Quel012476@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3621 magnus.blaudd@stripped	2011-10-31
      ndbcluster
       - remove THD arg for 'Thd_ndb::recycle_ndb' since Thd_ndb already have member variable
       m_thd
        - make 'Thd_ndb::valid_ndb' const

    modified:
      sql/ndb_thd.cc
      sql/ndb_thd_ndb.cc
      sql/ndb_thd_ndb.h
 3620 magnus.blaudd@stripped	2011-10-31 [merge]
      Merge in latest ndbcluster with schema dist refactorings

    added:
      sql/ndb_event_data.cc
      sql/ndb_event_data.h
    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ha_ndbcluster_glue.h
      sql/ndb_thd.cc
      sql/ndb_thd.h
      storage/ndb/CMakeLists.txt
=== modified file 'sql/ndb_thd.cc'
--- a/sql/ndb_thd.cc	2011-10-29 09:18:21 +0000
+++ b/sql/ndb_thd.cc	2011-10-31 09:22:55 +0000
@@ -37,7 +37,7 @@ Ndb* check_ndb_in_thd(THD* thd, bool val
 
   else if (validate_ndb && !thd_ndb->valid_ndb())
   {
-    if (!thd_ndb->recycle_ndb(thd))
+    if (!thd_ndb->recycle_ndb())
       return NULL;
   }
 

=== modified file 'sql/ndb_thd_ndb.cc'
--- a/sql/ndb_thd_ndb.cc	2011-10-17 18:13:57 +0000
+++ b/sql/ndb_thd_ndb.cc	2011-10-31 09:22:55 +0000
@@ -61,7 +61,7 @@ Thd_ndb::release(Thd_ndb* thd_ndb)
 
 
 bool
-Thd_ndb::recycle_ndb(THD* thd)
+Thd_ndb::recycle_ndb(void)
 {
   DBUG_ENTER("recycle_ndb");
   DBUG_PRINT("enter", ("ndb: 0x%lx", (long)ndb));
@@ -87,14 +87,14 @@ Thd_ndb::recycle_ndb(THD* thd)
   }
   else
   {
-    ndb->setCustomData64(thd_get_thread_id(thd));
+    ndb->setCustomData64(thd_get_thread_id(m_thd));
   }
   DBUG_RETURN(true);
 }
 
 
 bool
-Thd_ndb::valid_ndb(void)
+Thd_ndb::valid_ndb(void) const
 {
   // The ndb object should be valid as long as a
   // global schema lock transaction is ongoing

=== modified file 'sql/ndb_thd_ndb.h'
--- a/sql/ndb_thd_ndb.h	2011-06-23 06:59:40 +0000
+++ b/sql/ndb_thd_ndb.h	2011-10-31 09:22:55 +0000
@@ -135,8 +135,8 @@ public:
   bool has_required_global_schema_lock(const char* func);
 
   unsigned m_connect_count;
-  bool valid_ndb(void);
-  bool recycle_ndb(THD* thd);
+  bool valid_ndb(void) const;
+  bool recycle_ndb(void);
 };
 
 #endif

No bundle (reason: useless for push emails).