=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- mysql-test/suite/rpl_ndb/t/disabled.def	2009-10-23 14:02:54 +0000
+++ mysql-test/suite/rpl_ndb/t/disabled.def	2009-10-27 16:45:34 +0000
@@ -10,7 +10,5 @@
 #
 ##############################################################################
 
-rpl_ndb_ctype_ucs2_def : bug #34661 rpl_ndb_ctype_ucs2_def fails in 6.2
-
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 rpl_ndb_2ndb   : Bug#45974: rpl_ndb_2ndb fails sporadically

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- sql/ha_ndbcluster_binlog.cc	2009-10-23 17:49:51 +0000
+++ sql/ha_ndbcluster_binlog.cc	2009-10-27 16:48:51 +0000
@@ -5043,6 +5043,13 @@ restart:
     static char db[]= "";
     thd->db= db;
   }
+
+  /* Set Binlog Injector's 'client character set' to latin1 to 
+   * avoid any Binlogging framework problems with mb charsets.
+   * (Bug#34661)
+   */
+  thd->variables.character_set_client= &my_charset_latin1;
+
   do_ndbcluster_binlog_close_connection= BCCC_running;
   for ( ; !((ndbcluster_binlog_terminating ||
              do_ndbcluster_binlog_close_connection) &&
@@ -5258,7 +5265,6 @@ restart:
         i_ndb->setReportThreshEventFreeMem(ndb_report_thresh_binlog_mem_usage);
 
         bzero((char*)&_row, sizeof(_row));
-        thd->variables.character_set_client= &my_charset_latin1;
         injector::transaction trans;
         unsigned trans_row_count= 0;
         // pass table map before epoch