bk commit into 4.1 tree (pekka:1.2291)

[pekka]

Below is the list of changes that have just been committed into a local
4.1 repository of pekka. When pekka 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.2291 05/06/13 16:19:20 pekka@stripped +2 -0
  ndb - valgrind fixes

  ndb/test/ndbapi/testBlobs.cpp
    1.22 05/06/13 16:18:34 pekka@stripped +3 -2
    valgrind fixes

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.52 05/06/13 16:18:34 pekka@stripped +6 -1
    valgrind fixes

# 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:	pekka
# Host:	clam.ndb.mysql.com
# Root:	/export/space/pekka/ndb/version/my41

--- 1.51/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-04-27 18:17:17 +02:00
+++ 1.52/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-06-13 16:18:34 +02:00
@@ -1004,6 +1004,11 @@
     return 0;
   }
 
+  // avoid alignment problem and memory overrun
+  Uint32 name_buf[(MAX_TAB_NAME_SIZE + 3) / 4];
+  strncpy((char*)name_buf, name, sizeof(name_buf)); // strncpy null-pads
+  name = (char*)name_buf;
+
   req->senderRef = m_reference;
   req->senderData = 0;
   req->requestType = 
@@ -1015,7 +1020,7 @@
   tSignal.theLength = GetTabInfoReq::SignalLength;
   LinearSectionPtr ptr[1];
   ptr[0].p  = (Uint32*)name;
-  ptr[0].sz = strLen;
+  ptr[0].sz = (strLen + 3) / 4;
   
   return getTable(&tSignal, ptr, 1, fullyQualifiedNames);
 }

--- 1.21/ndb/test/ndbapi/testBlobs.cpp	2005-06-10 15:13:41 +02:00
+++ 1.22/ndb/test/ndbapi/testBlobs.cpp	2005-06-13 16:18:34 +02:00
@@ -365,7 +365,7 @@
 {
   if (b.m_nullable && urandom(10) == 0) {
     v.m_len = 0;
-    delete v.m_val;
+    delete [] v.m_val;
     v.m_val = 0;
     v.m_buf = new char [1];
   } else {
@@ -375,7 +375,7 @@
       v.m_len = urandom(b.m_inline);
     else
       v.m_len = urandom(b.m_inline + g_opt.m_parts * b.m_partsize + 1);
-    delete v.m_val;
+    delete [] v.m_val;
     v.m_val = new char [v.m_len + 1];
     for (unsigned i = 0; i < v.m_len; i++)
       v.m_val[i] = 'a' + urandom(25);
@@ -1449,6 +1449,7 @@
   if (! testcase('p'))
     return 0;
   DBG("=== perf test ===");
+  g_bh1 = g_bh2 = 0;
   g_ndb = new Ndb(g_ncc, "TEST_DB");
   CHK(g_ndb->init() == 0);
   CHK(g_ndb->waitUntilReady() == 0);