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

[Jonas Oreland]

 4447 Jonas Oreland	2012-01-30 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
 4446 Jonas Oreland	2012-01-30 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
=== modified file 'storage/ndb/src/kernel/blocks/backup/BackupInit.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2012-01-30 12:18:20 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2012-01-30 12:29:49 +0000
@@ -240,7 +240,7 @@ Backup::execREAD_CONFIG_REQ(Signal* sign
   Uint32 szMem = 0;
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MEM, &szMem);
 
-  szMem += 3 * extra (data+log+lcp);
+  szMem += 3 * extra; // (data+log+lcp);
   Uint32 noPages =
     (szMem + sizeof(Page32) - 1) / sizeof(Page32) +
     (c_defaults.m_lcp_buffer_size + sizeof(Page32) - 1) / sizeof(Page32);

No bundle (reason: useless for push emails).