From: Frazer Clement Date: January 31 2012 1:21pm Subject: bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4837 to 4838) List-Archive: http://lists.mysql.com/commits/142682 Message-Id: <201201311321.q0VDLWws008794@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4838 Frazer Clement 2012-01-31 Align #include behaviour with 7.2 modified: sql/ndb_conflict.cc sql/ndb_conflict.h 4837 Frazer Clement 2012-01-31 WL#6146 Extend Ndb conflict exceptions table Initial refactoring The ndb_rpl_conflict_basic testcase is extended to give better coverage. An unnecessary call to ndbcluster_read_binlog_replication() is removed. A new ExceptionsWriter class is created. Conflict detection/handling code is moved out into ndb_conflict.h and ndb_conflict.cc. No functional change. 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 #include No bundle (reason: useless for push emails).