bzr push into mysql-5.1-telco-7.0 branch (jonas:4046 to 4048)

[jonas oreland]

 4048 jonas oreland	2010-12-05
      ndb - attempt to fix spurious "unknown table ba" in ndb_binlog_variants

    modified:
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
 4047 jonas oreland	2010-12-05
      ndb - fix harmless typo in DBTC

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4046 Jonas Oreland	2010-12-03
      ndb - bug#58693 - prevent overflow during API_FAIL_REQ in SUMA

    modified:
      storage/ndb/src/kernel/blocks/LocalProxy.hpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.hpp
      storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2009-10-08 06:46:45 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2010-12-05 10:37:04 +0000
@@ -152,7 +152,9 @@ let $MYSQLD_DATADIR= `select @@datadir;`
 select * from ba order by ks;
 
 drop table ba;
-
+--disable_query_log
+flush logs;
+--enable_query_log
 
 # Bug#46662
 # Replicating changes to tables with unique indexes

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-12-02 11:02:29 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-12-05 10:36:30 +0000
@@ -2321,7 +2321,7 @@ void Dbtc::initApiConnectRec(Signal* sig
   regApiPtr->m_transaction_nodes.clear();
   regApiPtr->singleUserMode = 0;
   // Trigger data
-  releaseFiredTriggerData(&regApiPtr->theFiredTriggers),
+  releaseFiredTriggerData(&regApiPtr->theFiredTriggers);
   // Index data
   regApiPtr->indexOpReturn = false;
   regApiPtr->noIndexOp = 0;

No bundle (reason: useless for push emails).