From: magnus.blaudd
Date: June 7 2011 1:29pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4446)
List-Archive: http://lists.mysql.com/commits/138784
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3594770700516775183=="

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

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

 4446 magnus.blaudd@stripped	2011-06-07
      ndb
       - remove usage of my_malloc and my_free from ndbapi

    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 12:48:01 +0000
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp	2011-06-07 13:28:40 +0000
@@ -2193,7 +2193,7 @@ NdbIndexStatImpl::MemDefault::mem_alloc(
   {
     size += 4 - size % 4;
   }
-  Item* item = (Item*)my_malloc(sizeof(Item) + size, MYF(0));
+  Item* item = (Item*)malloc(sizeof(Item) + size);
   if (item != 0)
   {
     item->m_magic = MemMagic;
@@ -2214,7 +2214,7 @@ NdbIndexStatImpl::MemDefault::mem_free(v
     assert(item->m_magic == MemMagic);
     size_t size = item->m_size;
     item->m_magic = 0;
-    my_free(item, MYF(0));
+    free(item);
     assert(m_used >= size);
     m_used -= size;
   }


--===============3594770700516775183==
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\
#   jmdypw6pgr2z40jv
# target_branch: file:///data0/magnus/mysql/7.0/
# testament_sha1: 71322909ec82ef728ff967d7311beefbd1ff5578
# timestamp: 2011-06-07 15:29:06 +0200
# base_revision_id: magnus.blaudd@stripped\
#   oelbpd2iaozj2204
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeAJcyUAAX3fgEAQUHv//1Ih
CAC////wUANnuusOY6HSg00ianqYFP1IPTU21CMmI8kYm0mmDSapk9R4iPKep+qNNGgAAAACURpq
NJ6TJNHpHpD1NDQ0AANBhoaAAADQAAAAAkkQ0DQp6YmiZqaZGmpk9Q00aHqLVZWD+dBCDlGsiukz
oBc7FXlkLVdSiiMsrIbJiSnCgDBr6FJE4i0s40y3cP9d9p+4Y5MGaSNJDaKufNkbcwVhR1FGrC57
XsSnmRHiNm3baK0+Lwzz2zHykXJGCX0rbCmh0SFMhItu2QwBQR7sibBfIEYQ3ZkioSjukgvCKTSh
p6wBYGWyYE59Z1iEtzY02SilO5LGJlcMQ0XdEc5lASTmJnMhkCTvQAnApC8gKDX0uC2egTnhkhwn
XjSMK3EcQd+znCwrO8U67CrxHxkWhBqXoppr4yYTFiSKFacos5HTCEg5oTNrHOGqURScSydfXqZh
wRy7RrMdVpQ/S6dqCjWlRCreI2q6R0YS0CGVV0aEjNr2X3uj41Fg0jOwSEnU5KuFQxa/Fx50adam
FhvKW33VaYl1yuqC0gKxQuLQ8B2I3i8VRtEu3ImfkqIJA8gjBXx/Zjj7XTveQGH3v3yCZUykjR4b
bLBfciCegiukNQbkQfBGSDfSULzyrROQZjikcr+EO48eGRMHkZepOZSnNIiHpxR7mJtM42mySv1f
CxmSIpFbLdLPHdhtCm8eQWhBcKJI66FQkXy/1kaF6Q6+hyi4tKKctBZ4dfu7jIBVabVLoShQDDFh
sW5jNyyGhuMUU5ZlCqiLpVYbZhAHorUEyvwkdVnnSQCCgn0D8WNkXntQWfOrnqY7+38e/frLEqmS
MBbTIIciSINkXa/QOY6/31JoZl2sHhh0RiW+2ep+AaBPNvkXLwC4XAXDvHmAe3Pf56LQIhFwYpDB
srSGPDFj0gprmBhFOsOp0GcX+exPcSk3znJGkpG9zlFcIZOMD0ktueU1JrjmQgy1pDl46jumCuHO
TWCnDR5/kjkipZuVmWISJ26zJmW4JCGgpx68qLlvo+wupPisxVgEbe4uginhEnzTTTXG/xdwvRCp
aNlQ1rZiFsNtiYZNYdZMLF09N7h0pb2YdbxZiy440YVVjylFYSMqfgvmSM4TJFXmipnq8NgmgyK1
wJqhfUVdgVBP/xdyRThQkOAJcyU=


--===============3594770700516775183==--