bzr push into mysql-5.5-cluster branch (magnus.blaudd:3598 to 3599)

[Magnus Blåudd]

 3599 Magnus Blåudd	2011-10-19
      ndb binlog
       - remove "fall through" comments from places which aren't
       - add empty lines around case blocks

    modified:
      sql/ha_ndbcluster_binlog.cc
 3598 [e-mail]	2011-10-19
      ndb
       - move Mutex_guard into the only file where it's used

    modified:
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-10-19 12:31:45 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-10-19 12:51:51 +0000
@@ -2494,17 +2494,15 @@ ndb_binlog_thread_handle_schema_event(TH
         */
         post_epoch_log_list->push_back(schema, mem_root);
         DBUG_RETURN(0);
+
       case SOT_ALTER_TABLE_COMMIT:
-        // fall through
       case SOT_RENAME_TABLE_PREPARE:
-        // fall through
       case SOT_ONLINE_ALTER_TABLE_PREPARE:
-        // fall through
       case SOT_ONLINE_ALTER_TABLE_COMMIT:
         post_epoch_log_list->push_back(schema, mem_root);
         post_epoch_unlock_list->push_back(schema, mem_root);
         DBUG_RETURN(0);
-        break;
+
       default:
         break;
       }
@@ -2517,7 +2515,6 @@ ndb_binlog_thread_handle_schema_event(TH
         switch (schema_type)
         {
         case SOT_RENAME_TABLE:
-          // fall through
         case SOT_RENAME_TABLE_NEW:
         {
           uint end= my_snprintf(&errmsg[0], MYSQL_ERRMSG_SIZE,
@@ -5826,13 +5823,13 @@ ndb_binlog_thread_handle_non_data_event(
                         share->key, (long) share, (long) pOp,
                         (long) share->op, (long) share->new_op));
     break;
+
   case NDBEVENT::TE_NODE_FAILURE:
-    /* fall through */
   case NDBEVENT::TE_SUBSCRIBE:
-    /* fall through */
   case NDBEVENT::TE_UNSUBSCRIBE:
     /* ignore */
     return 0;
+
   default:
     sql_print_error("NDB Binlog: unknown non data event %d for %s. "
                     "Ignoring...", (unsigned) type, share->key);
@@ -5944,10 +5941,10 @@ ndb_binlog_thread_handle_data_event(THD*
       switch(pOp->getEventType())
       {
       case NDBEVENT::TE_INSERT:
-        // fall through
       case NDBEVENT::TE_UPDATE:
         event_has_data = true;
         break;
+
       case NDBEVENT::TE_DELETE:
         break;
       default:

No bundle (reason: useless for push emails).