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

[Jonas Oreland]

 4267 Jonas Oreland	2011-06-29
      ndb - bump version to 7.1.16

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
 4266 Jonas Oreland	2011-06-29 {clone-mysql-5.1.56-ndb-7.1.15-src-build} [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
 4265 jonas oreland	2011-06-28 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/ndbapi/NdbIndexStat.hpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
=== modified file 'configure.in'
--- a/configure.in	2011-05-24 08:46:21 +0000
+++ b/configure.in	2011-06-29 08:17:07 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.56-ndb-7.1.15], [], [mysql])
+AC_INIT([MySQL Server], [5.1.56-ndb-7.1.16], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2011-05-24 08:46:21 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-06-29 08:17:07 +0000
@@ -2,7 +2,7 @@
 # Should be updated when creating a new NDB version
 NDB_VERSION_MAJOR=7
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=15
+NDB_VERSION_BUILD=16
 NDB_VERSION_STATUS=""
 
 dnl ---------------------------------------------------------------------------

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2011-06-28 09:33:33 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2011-06-29 07:56:14 +0000
@@ -979,8 +979,8 @@ ArrayPool<TupTriggerData> c_triggerPool;
       subscriptionUpdateTriggers(triggerPool),
       constraintUpdateTriggers(triggerPool),
       deferredInsertTriggers(triggerPool),
-      deferredDeleteTriggers(triggerPool),
       deferredUpdateTriggers(triggerPool),
+      deferredDeleteTriggers(triggerPool),
       tuxCustomTriggers(triggerPool)
       {}
     

=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2011-05-31 12:28:59 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2011-06-29 07:47:26 +0000
@@ -132,9 +132,9 @@ Suma::execREAD_CONFIG_REQ(Signal* signal
 
   // SumaParticipant
   Uint32 noTables, noAttrs, maxBufferedEpochs;
-  ndb_mgm_get_int_parameter(p, CFG_DB_NO_TABLES,  
+  ndb_mgm_get_int_parameter(p, CFG_DICT_TABLE,
 			    &noTables);
-  ndb_mgm_get_int_parameter(p, CFG_DB_NO_ATTRIBUTES,  
+  ndb_mgm_get_int_parameter(p, CFG_DICT_ATTRIBUTE,
 			    &noAttrs);
   ndb_mgm_get_int_parameter(p, CFG_DB_MAX_BUFFERED_EPOCHS,
                             &maxBufferedEpochs);

No bundle (reason: useless for push emails).