bzr push into mysql-5.1-telco-6.3 branch (jonas.oreland:3446 to 3447) Bug#47793 Bug#61684

[Jonas Oreland]

 3447 Jonas Oreland	2011-06-29
      ndb - bug#61684 - align dict/suma wrt to MaxNoOfTables (aka introduce bug#47793 in suma)

    modified:
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
 3446 Jonas Oreland	2011-06-28
      ndb - fix ctype_cp932_binlog_stm also in 6.3

    modified:
      mysql-test/t/ctype_cp932_binlog_stm.test
=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2011-05-30 11:52:38 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2011-06-29 07:45:09 +0000
@@ -183,9 +183,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).