bzr push into mysql-5.1-telco-7.1 branch (Martin.Skold:4592 to 4593)

[Martin Skold]

 4593 Martin Skold	2012-08-21
      Fixed correct log_part to be displayed in ndbinfo

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 4592 Frazer Clement	2012-08-13 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-08-13 15:06:12 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-08-21 07:33:17 +0000
@@ -23701,7 +23701,7 @@ void Dblqh::execDBINFO_SCANREQ(Signal *s
       row.write_uint32(getOwnNodeId());
       row.write_uint32(0);              // log type, 0 = REDO
       row.write_uint32(0);              // log id, always 0 in LQH
-      row.write_uint32(logpart);        // log part
+      row.write_uint32(logPartPtr.p->logPartNo); // log part
 
       row.write_uint64(total*1024*1024);          // total allocated
       row.write_uint64((total-mb)*1024*1024);     // currently in use

No bundle (reason: useless for push emails).