bzr commit into mysql-5.1-telco-7.1 branch (jonas:4199)

[Jonas Oreland]

#At file:///home/jonas/src/telco-7.1/ based on revid:jonas@stripped

 4199 Jonas Oreland	2011-05-17 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2011-05-17 07:06:30 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2011-05-17 11:41:50 +0000
@@ -444,6 +444,8 @@ public:
    */
   struct TabRecord
   {
+    TabRecord() { }
+
     /**
      * rw-lock that protects multiple parallel DIGETNODES (readers) from
      *   updates to fragmenation changes (e.g CREATE_FRAGREQ)...

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-04-21 15:43:34 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-05-17 12:14:32 +0000
@@ -15325,6 +15325,7 @@ void Dbdih::initRestorableGciFiles() 
 
 void Dbdih::initTable(TabRecordPtr tabPtr)
 {
+  new (tabPtr.p) TabRecord();
   tabPtr.p->noOfFragChunks = 0;
   tabPtr.p->method = TabRecord::NOTDEFINED;
   tabPtr.p->tabStatus = TabRecord::TS_IDLE;

No bundle (reason: revision is a merge).