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

[jonas oreland]

 4844 jonas oreland	2012-02-01
      ndb - fix overlapping memcpy causing error with new glibc (that performs memcpy backwards)

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4843 jonas oreland	2012-02-01
      ndb - revert change to ndb_index_stat_enable, as it had other races...

    modified:
      mysql-test/suite/ndb/t/ndb_index_stat_enable.inc
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-01-26 06:33:02 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-02-01 17:36:16 +0000
@@ -3155,7 +3155,8 @@ handle_reorg_trigger(DiGetNodesConf * co
   {
     conf->fragId = conf->nodes[MAX_REPLICAS];
     conf->reqinfo = conf->nodes[MAX_REPLICAS+1];
-    memcpy(conf->nodes, conf->nodes+MAX_REPLICAS+2, sizeof(conf->nodes));
+    memcpy(conf->nodes, conf->nodes+MAX_REPLICAS+2,
+           sizeof(Uint32)*MAX_REPLICAS);
   }
   else
   {

No bundle (reason: useless for push emails).