From: magnus.blaudd
Date: June 7 2011 12:48pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4445)
List-Archive: http://lists.mysql.com/commits/138776
Message-Id: <20110607124807.3CD9713402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2733560969051860653=="

--===============2733560969051860653==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4445 magnus.blaudd@stripped	2011-06-07
      ndb - fix warning about conversion between different datatypes

    modified:
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp	2011-06-07 10:03:02 +0000
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp	2011-06-07 12:48:01 +0000
@@ -2212,7 +2212,7 @@ NdbIndexStatImpl::MemDefault::mem_free(v
   {
     Item* item = (Item*)ptr - 1;
     assert(item->m_magic == MemMagic);
-    Uint32 size = item->m_size;
+    size_t size = item->m_size;
     item->m_magic = 0;
     my_free(item, MYF(0));
     assert(m_used >= size);


--===============2733560969051860653==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   oelbpd2iaozj2204
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 61821980031ed0ddd8712afb821cdfe236a3102e
# timestamp: 2011-06-07 14:48:07 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   o727t5qy6ducnjhm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdgtRp0AAWzfgEAQUGP//1Ih
CAC////wUANVert1tztTDISiQGU1PJoehqBqbQh6TQZGmQSiCYEaGk0mp6TTNR6gGhoaMGhT1GKa
emiAD1AaAAAAwAA0AAZNAAAGgEkk0Yggyap7UntTDRTxqjQ9CGmZnx4L45aFuDUXGNALw2arGOqj
I+FulVVTx+ift0FMTTEsXrjPMLFdz78sKuqo1Tvuq69MsI3IxULs6zk51ELImbZbnkqVEvfnm7+i
GvYIKmdZOvR4kVV1tRFBG+Xex6OBJzlQCYRO+lPWmA7tTjYJq6BP+sc5ArTbsiCSa6CBZ/vjeeh9
9qoznVxsENpHdQnjGeOmfgYOvBQQZe4sFWgsviprcFP5PDZbUbZTGAtUK6qJ2bKWWklZWJxXIc4b
ShIRhYY1kCOvlG1edGAKM4SIeTg01ygWHouKtK3i7FNmH8cTWidOFsjBFEMMVNjsaqaXApSKeabS
LZTS+6FYhNf7JpvbXNoe3PmS8jYPNScx1E2ITRJQaPkUi6mhnqRVa2Se+ZIzIHmHVAloofUc0EAR
EDWyEbDlCgTMN+4QxOUarZZumfYohK5RVXox2DeWSSRULnYx71bLm8iUJ7DY+Saw8WSnE+/QRDW5
GsRzuufMK6mSP/CJHS5y5CMn8uY5GZbtmMxGiQu3fiFx1KAvxu39M2xfKLMInWhIs1uXbLLt5iVp
VGD0zNHPS4hofLJ/fj5tDUQwZG7EsSdCjlUm6AJh51ix4DsST3eX5Bgycbq36hlLUJYuM+nYzlRT
q7ltJ66QYcBM2dE9EVN3Z3xw58locphNJo7XI4w3lKUJl/cNpapwK/SOBuEcohlLQn+UrKEteZbX
iPGVc/CLNBK7QiCzFC0qd2hojehrBuuiMOG0TIjb9x12F4enbz7eOC4BqDU4MBDC3aBDHLDOFoiF
PvsXqeBnGS9CtpPsMZp3nxOfDT2MHBucZwjuLND6mIsY6b1YJ7LyEOVHGCgws4gqEZ5TUFwjqiSw
cqsdgnrb54bWZUCeQ8RmXeWhb5YlfRSwUq0lZQ+dEe+w72xTDRtn1XAMhCEKPO6vsUpvyDJp/5pr
3cX1OpQKrbP4wXfPqmA6Rf0Uc2+lzq/elhpJCgOVJaT/ovBwjfGAilggFdlM0GRUuymyo41x7sFY
qfkXckU4UJDYLUad


--===============2733560969051860653==--