bzr push into mysql-5.5-cluster branch (magnus.blaudd:3635 to 3636)

[magnus.blaudd]

 3636 magnus.blaudd@stripped	2011-11-08
      ndb schema dist - fix warning about unused var

    modified:
      sql/ha_ndbcluster_binlog.cc
 3635 magnus.blaudd@stripped	2011-11-08 [merge]
      Merge

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/handler.cc
      sql/ndb_ndbapi_util.cc
      sql/ndb_ndbapi_util.h
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-07 22:53:15 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-08 00:16:20 +0000
@@ -3120,15 +3120,9 @@ class Ndb_schema_event_handler {
   {
     DBUG_ENTER("handle_schema_op_post_epoch");
     THD* thd = m_thd; // Code compatibility
-    Thd_ndb *thd_ndb= get_thd_ndb(thd);
-    Ndb *ndb= thd_ndb->ndb;
-    NDBDICT *dict= ndb->getDictionary();
-
-    DBUG_PRINT("info",
-               ("%s.%s: log query_length: %d  query: '%s'  type: %d",
-                schema->db, schema->name,
-                schema->query_length, schema->query,
-                schema->type));
+    DBUG_PRINT("enter", ("%s.%s: query: '%s'  type: %d",
+                         schema->db, schema->name,
+                         schema->query, schema->type));
 
     {
       const SCHEMA_OP_TYPE schema_type= (SCHEMA_OP_TYPE)schema->type;

No bundle (reason: useless for push emails).