bzr push into mysql-5.1-telco-7.1 branch (frazer.clement:4450 to 4451)

[Frazer Clement]

 4451 Frazer Clement	2012-01-31 [merge]
      Merge 7.0->7.1

    modified:
      sql/ndb_conflict.cc
      sql/ndb_conflict.h
 4450 Frazer Clement	2012-01-31 [merge]
      Merge 7.0->7.1

    added:
      sql/ndb_conflict.cc
      sql/ndb_conflict.h
    modified:
      libmysqld/Makefile.am
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_basic.test
      sql/Makefile.am
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      storage/ndb/CMakeLists.txt
=== modified file 'sql/ndb_conflict.cc'
--- a/sql/ndb_conflict.cc	2012-01-31 10:01:22 +0000
+++ b/sql/ndb_conflict.cc	2012-01-31 13:12:32 +0000
@@ -18,7 +18,7 @@
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 /* distcheck does not compile from here... */
-
+#include "ha_ndbcluster_glue.h"
 #include "ndb_conflict.h"
 
 #ifdef HAVE_NDB_BINLOG

=== modified file 'sql/ndb_conflict.h'
--- a/sql/ndb_conflict.h	2012-01-31 10:01:22 +0000
+++ b/sql/ndb_conflict.h	2012-01-31 13:12:32 +0000
@@ -18,7 +18,6 @@
 #ifndef NDB_CONFLICT_H
 #define NDB_CONFLICT_H
 
-#include "ha_ndbcluster_glue.h"
 #include "ndb_conflict_trans.h"
 #include <ndbapi/NdbDictionary.hpp>
 #include <ndbapi/NdbTransaction.hpp>

No bundle (reason: useless for push emails).