bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4498 to 4499)

[Frazer Clement]

 4499 Frazer Clement	2011-09-02
      Stabilise ndb_rpl_conflict_epoch

    modified:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc
 4498 jonas oreland	2011-09-02 [merge]
      ndb - merge latest index-stat fixes\!

    modified:
      mysql-test/suite/ndb/r/ndb_index_stat.result
      mysql-test/suite/ndb/r/ndb_statistics1.result
      mysql-test/suite/ndb/t/ndb_index_stat.test
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      storage/ndb/src/ndbapi/NdbIndexStat.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
      storage/ndb/src/ndbapi/ndberror.c
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc	2011-07-07 14:48:06 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc	2011-09-02 11:37:43 +0000
@@ -48,6 +48,9 @@ replace into test.t2 values (2, 1);
 --connection slave
 --echo -- Flushed to slave
 select * from test.t1 order by a;
+--disable_query_log
+FLUSH LOGS;
+--enable_query_log
 --sync_slave_with_master master
 --connection master
 --echo -- Flushed back to Master

No bundle (reason: useless for push emails).