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

[Mauritz Sundell]

 4578 Mauritz Sundell	2011-10-07
      Added names to already existing but unnamed resources.
      Resources was named <unknown>' in table ndbinfo.resources.

    modified:
      storage/ndb/tools/ndbinfo_sql.cpp
 4577 jonas oreland	2011-10-07
      ndb - fix result files and rate-limit for threadblocks

    modified:
      mysql-test/suite/ndb/r/ndbinfo.result
      mysql-test/suite/ndb/r/ndbinfo_dump.result
      storage/ndb/src/kernel/blocks/thrman.cpp
=== modified file 'storage/ndb/tools/ndbinfo_sql.cpp'
--- a/storage/ndb/tools/ndbinfo_sql.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/tools/ndbinfo_sql.cpp	2011-10-07 11:33:26 +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).