From: Date: April 7 2006 3:48pm
Subject: bk commit into 5.0 tree (jonas:1.2140) BUG#11033
List-Archive: http://lists.mysql.com/commits/4638
X-Bug: 11033
Message-Id: <20060407134818.19B4536FB38@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2140 06/04/07 15:48:13 jonas@stripped +1 -0
  ndb - bug#11033
    silent valgrind warnings 5.0, ndb_autodiscover

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.86 06/04/07 15:48:10 jonas@stripped +6 -1
    append 4 bytes of 0's to end of buffer to shut valgrind up

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-work

--- 1.85/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-03-27 13:15:38 +02:00
+++ 1.86/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-04-07 15:48:10 +02:00
@@ -1109,9 +1109,14 @@
 
   // Copy name to m_buffer to get a word sized buffer
   m_buffer.clear();
-  m_buffer.grow(namelen_words*4);
+  m_buffer.grow(namelen_words*4+4);
   m_buffer.append(name.c_str(), namelen);
 
+#ifndef IGNORE_VALGRIND_WARNINGS
+  Uint32 pad = 0;
+  m_buffer.append(&pad, 4);
+#endif
+  
   LinearSectionPtr ptr[1];
   ptr[0].p= (Uint32*)m_buffer.get_data();
   ptr[0].sz= namelen_words;