bzr push into mysql-5.1-telco-7.0 branch (mauritz.sundell:4579 to 4580)

[Mauritz Sundell]

 4580 Mauritz Sundell	2011-10-07
      ndb - Added names to already existing but unnamed resources.
      
      Added names to already existing but unnamed resources.
      Resources was named <unknown>' in table ndbinfo.resources.
      
      Recommit of earlier commit that disappered in previous commit,
      stupid me.

    modified:
      storage/ndb/tools/ndbinfo_sql.cpp
 4579 Mauritz Sundell	2011-10-07
      ndb - Adding pool parameter to container templates.
      
      Adding pool parameter to container templates, default to previous
      behaviour using ArrayPool<T>.
      Also let MAKE_TID construct Uint32 value to avoid signed/unsigned warnings.

    modified:
      storage/ndb/src/kernel/vm/DLFifoList.hpp
      storage/ndb/src/kernel/vm/DLHashTable.hpp
      storage/ndb/src/kernel/vm/DataBuffer2.hpp
      storage/ndb/src/kernel/vm/Pool.hpp
      storage/ndb/tools/ndbinfo_sql.cpp
=== modified file 'storage/ndb/tools/ndbinfo_sql.cpp'
--- a/storage/ndb/tools/ndbinfo_sql.cpp	2011-10-07 11:46:40 +0000
+++ b/storage/ndb/tools/ndbinfo_sql.cpp	2011-10-07 11:54:16 +0000
@@ -99,6 +99,8 @@ struct view {
     "  WHEN 4 THEN \"JOBBUFFER\""
     "  WHEN 5 THEN \"FILE_BUFFERS\""
     "  WHEN 6 THEN \"TRANSPORTER_BUFFERS\""
+    "  WHEN 7 THEN \"DISK_PAGE_BUFFER\""
+    "  WHEN 8 THEN \"QUERY_MEMORY\""
     "  ELSE \"<unknown>\" "
     " END AS resource_name, "
     "reserved, used, max "

No bundle (reason: useless for push emails).