bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4318 to 4319)

[jonas oreland]

 4319 jonas oreland	2011-10-28
      ndb - update result file

    modified:
      mysql-test/suite/ndb/r/ndbinfo_dump.result
 4318 jonas oreland	2011-10-28 [merge]
      ndb - merge 70 to 71

    added:
      storage/ndb/include/kernel/statedesc.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhStateDesc.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcStateDesc.cpp
    modified:
      mysql-test/suite/ndb/r/ndbinfo.result
      mysql-test/suite/ndb/t/ndbinfo.test
      scripts/mysql_system_tables.sql
      sql/ha_ndbcluster_connection.cc
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/test/src/HugoQueries.cpp
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/Makefile.am
      storage/ndb/tools/ndbinfo_sql.cpp
=== modified file 'mysql-test/suite/ndb/r/ndbinfo_dump.result'
--- a/mysql-test/suite/ndb/r/ndbinfo_dump.result	2011-10-07 17:15:53 +0000
+++ b/mysql-test/suite/ndb/r/ndbinfo_dump.result	2011-10-28 13:01:42 +0000
@@ -1,7 +1,7 @@
 USE ndbinfo;
 select count(*) from blocks;
 count(*)
-21
+22
 select count(*) from blocks;
 count(*)
-21
+22

No bundle (reason: useless for push emails).