bzr push into mysql-5.5-cluster branch (magnus.blaudd:3655 to 3657)

[magnus.blaudd]

 3657 magnus.blaudd@stripped	2011-11-21
      ndb schema dist
       - handle SOT_RENAME_TABLE_NEW by printing and ewrror message descibing that it's
        an old schema operation and it has been skipped.

    modified:
      sql/ha_ndbcluster_binlog.cc
 3656 magnus.blaudd@stripped	2011-11-21
      ndb schema dist - fix unused warning

    modified:
      sql/ha_ndbcluster_binlog.cc
 3655 magnus.blaudd@stripped	2011-11-10
      ndb schem dist
       - finally remopve the duplicate switch in handle_schema_op and handle each op only once

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-10 10:56:46 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-21 09:47:00 +0000
@@ -3275,6 +3275,17 @@ class Ndb_schema_event_handler {
         write_schema_op_to_binlog(m_thd, schema);
         break;
 
+      case SOT_RENAME_TABLE_NEW:
+        /*
+          Only very old MySQL Server connected to the cluster may
+          send this schema operation, ignore it
+        */
+        sql_print_error("NDB schema: Skipping old schema operation"
+                        "(RENAME_TABLE_NEW) on %s.%s",
+                        schema->db, schema->name);
+        DBUG_ASSERT(false);
+        break;
+
       }
 
       /* signal that schema operation has been handled */
@@ -3293,7 +3304,6 @@ class Ndb_schema_event_handler {
   handle_schema_op_post_epoch(Ndb_schema_op* schema)
   {
     DBUG_ENTER("handle_schema_op_post_epoch");
-    THD* thd = m_thd; // Code compatibility
     DBUG_PRINT("enter", ("%s.%s: query: '%s'  type: %d",
                          schema->db, schema->name,
                          schema->query, schema->type));

No bundle (reason: useless for push emails).