bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4480 to 4481)

[Jonas Oreland]

 4481 Jonas Oreland	2011-06-28
      ndb - fix compiler warning

    modified:
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
 4480 Jonas Oreland	2011-06-28 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/ndbapi/NdbTransaction.cpp
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2011-05-25 13:19:02 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2011-06-28 09:33:33 +0000
@@ -978,10 +978,10 @@ ArrayPool<TupTriggerData> c_triggerPool;
       subscriptionDeleteTriggers(triggerPool),
       subscriptionUpdateTriggers(triggerPool),
       constraintUpdateTriggers(triggerPool),
-      tuxCustomTriggers(triggerPool),
       deferredInsertTriggers(triggerPool),
       deferredDeleteTriggers(triggerPool),
-      deferredUpdateTriggers(triggerPool)
+      deferredUpdateTriggers(triggerPool),
+      tuxCustomTriggers(triggerPool)
       {}
     
     Bitmask<MAXNROFATTRIBUTESINWORDS> notNullAttributeMask;

No bundle (reason: useless for push emails).