bzr push into mysql-5.5-cluster branch (magnus.blaudd:3624 to 3625)

[Magnus Blåudd]

 3625 Magnus Blåudd	2011-11-03
      ndb schema dist
       - remove unused "sz" variable only used for DBUG_ASSERT

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

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ndb_schema_dist.cc
      sql/ndb_schema_dist.h
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-02 09:29:45 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-03 13:11:57 +0000
@@ -2354,7 +2354,6 @@ class Ndb_schema_event_handler {
     int retries= 100;
     int retry_sleep= 30; /* 30 milliseconds, transaction */
     const NDBCOL *col[SCHEMA_SIZE];
-    unsigned sz[SCHEMA_SIZE];
 
     MY_BITMAP slock;
     uint32 bitbuf[SCHEMA_SLOCK_SIZE/4];
@@ -2374,8 +2373,7 @@ class Ndb_schema_event_handler {
         col[i]= ndbtab->getColumn(i);
         if (i != SCHEMA_QUERY_I)
         {
-          sz[i]= col[i]->getLength();
-          DBUG_ASSERT(sz[i] <= sizeof(tmp_buf));
+          DBUG_ASSERT(col[i]->getLength() <= sizeof(tmp_buf));
         }
       }
     }

No bundle (reason: useless for push emails).