bzr push into mysql-5.1-telco-6.3 branch (tomas.ulin:2848 to 2849)

[Tomas Ulin]

 2849 Tomas Ulin	2009-02-17
      remove warning
      modified:
        sql/ha_ndbcluster.cc

 2848 Tomas Ulin	2009-02-16
      post merge fixes
      renamed:
        mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
      modified:
        mysql-test/suite/rpl_ndb/r/rpl_ndb_logging.result
        mysql-test/suite/rpl_ndb/t/disabled.def
        mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test
        mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test
        mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2009-02-16 15:54:40 +0000
+++ b/sql/ha_ndbcluster.cc	2009-02-17 07:29:19 +0000
@@ -3340,7 +3340,9 @@ int ha_ndbcluster::ndb_write_row(uchar *
   }
 
   const MY_BITMAP *user_cols_written_bitmap;
+#ifdef HAVE_NDB_BINLOG
   uchar* ex_data_buffer= NULL;
+#endif
   
   if (m_use_write
 #ifdef HAVE_NDB_BINLOG