bzr push into mysql-5.1-telco-7.1 branch (maitrayi.sabaratnam:4642 to 4643)

[Maitrayi Sabaratnam]

 4643 Maitrayi Sabaratnam	2012-11-01 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 4642 Martin Skold	2012-11-01
      Added option to specify specific binlog_file to wait for, changed name of variable since it was already used

    modified:
      mysql-test/include/wait_for_binlog_event.inc
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2012-11-01 12:12:29 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2012-11-01 19:28:11 +0000
@@ -5667,9 +5667,9 @@ Qmgr::execARBIT_PREPREQ(Signal* signal)
       BaseString tmp(BaseString::getPrettyTextShort(c_connectedNodes).c_str());
       Vector<BaseString> split;
       tmp.split(split, "", 92);
-      for(int i = 0; i < split.size(); ++i)
+      for(unsigned i = 0; i < split.size(); ++i)
       {
-        warningEvent("%s", split[i]);
+        warningEvent("%s", split[i].c_str());
       }
     }
 

No bundle (reason: useless for push emails).