From f54a2ff55b5b306d920be4349df78326d6fa2cd8 Mon Sep 17 00:00:00 2001
From: "stewart@mysql.com" <>
Date: Thu, 6 Apr 2006 17:02:56 +1000
Subject: [PATCH 1/2] BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump
 test

---
 storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
index 47b2dfb1c77..fc11cf1b1a9 100644
--- a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
@@ -244,8 +244,10 @@ DictFilegroupInfo::Filegroup::init(){
   TS_DataGrow.GrowLimit = 0;
   TS_DataGrow.GrowSizeHi = 0;
   TS_DataGrow.GrowSizeLo = 0;
-  memset(TS_DataGrow.GrowPattern, sizeof(TS_DataGrow.GrowPattern), 0);
+  memset(TS_DataGrow.GrowPattern, 0, sizeof(TS_DataGrow.GrowPattern));
   TS_DataGrow.GrowMaxSize = 0;
+  LF_UndoFreeWordsHi= 0;
+  LF_UndoFreeWordsLo= 0;
 }
 
 void

From c7f3ce1148c5937ad84b5999b15e895725ec26c1 Mon Sep 17 00:00:00 2001
From: "stewart@mysql.com" <>
Date: Thu, 6 Apr 2006 17:13:17 +1000
Subject: [PATCH 2/2] BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump
 test

don't know why this didn't generate a warning, but let's fix it too.
---
 storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
index fc11cf1b1a9..b9f91c510c0 100644
--- a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
@@ -233,7 +233,7 @@ sizeof(SimpleProperties::SP2StructMapping);
 
 void
 DictFilegroupInfo::Filegroup::init(){
-  memset(FilegroupName, sizeof(FilegroupName), 0);
+  memset(FilegroupName, 0, sizeof(FilegroupName));
   FilegroupType = ~0;
   FilegroupId = ~0;
   FilegroupVersion = ~0;