From: Martin Skold
Date: November 23 2012 10:35pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (Martin.Skold:4675 to 4676)
List-Archive: http://lists.mysql.com/commits/145383
Message-Id: <20121123223547.233CC9F825C@quadfish>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4676 Martin Skold	2012-11-23 [merge]
      Merge from 7.0

    modified:
      sql/ha_ndbcluster_binlog.cc
 4675 Martin Skold	2012-11-23 [merge]
      Merge from 7.0

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2012-11-23 16:01:53 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2012-11-23 22:35:16 +0000
@@ -2220,7 +2220,7 @@ int ndbcluster_log_schema_op(THD *thd,
   char quoted_db1[2 + 2 * FN_REFLEN + 1];
   char quoted_db2[2 + 2 * FN_REFLEN + 1];
   char quoted_table2[2 + 2 * FN_REFLEN + 1];
-  int id_length= 0;
+  size_t id_length= 0;
   const char *type_str;
   int also_internal= 0;
   uint32 log_type= (uint32)type;

No bundle (reason: useless for push emails).