From: Martin Skold
Date: November 23 2012 10:34pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (Martin.Skold:5047 to 5048)
List-Archive: http://lists.mysql.com/commits/145384
Message-Id: <20121123223438.2D1679F825C@quadfish>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5048 Martin Skold	2012-11-23 [merge]
      Merge from 6.3

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

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2012-11-23 16:00:01 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2012-11-23 22:33:39 +0000
@@ -2175,7 +2175,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).