Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new-bug18831

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;
@@ -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