===== sql/log_event.cc 1.278 vs edited =====
--- 1.278/sql/log_event.cc	2007-05-03 04:11:19 +10:00
+++ edited/sql/log_event.cc	2007-07-05 15:32:40 +10:00
@@ -28,6 +28,8 @@
 #include "rpl_utility.h"
 #include "rpl_record.h"
 #include <my_dir.h>
+#else /* MYSQL_CLIENT */
+#include <sql_string.h>
 #endif /* MYSQL_CLIENT */
 #include <base64.h>
 #include <my_bitmap.h>
@@ -1845,7 +1847,8 @@
         my_b_printf(file, "/*!\\C %s */%s\n",
                     cs_info->csname, print_event_info->delimiter);
       }
-      my_b_printf(file,"SET "
+      char buf[200];
+      my_snprintf(buf,sizeof(buf),"SET "
                   "@@session.character_set_client=%d,"
                   "@@session.collation_connection=%d,"
                   "@@session.collation_server=%d"
@@ -1854,6 +1857,10 @@
                   uint2korr(charset+2),
                   uint2korr(charset+4),
                   print_event_info->delimiter);
+      String s((char*)NULL, 0, cs_info);
+      s.append(buf);
+      my_b_write(file, s.c_ptr(), s.length());
+
       memcpy(print_event_info->charset, charset, 6);
     }
   }
 
===== client/Makefile.am 1.93 vs edited =====
--- 1.93/client/Makefile.am	2007-05-02 22:16:17 +10:00
+++ edited/client/Makefile.am	2007-07-05 15:26:05 +10:00
@@ -63,7 +63,8 @@
 				$(top_srcdir)/mysys/my_bit.c \
 				$(top_srcdir)/mysys/my_bitmap.c \
 				$(top_srcdir)/mysys/my_vle.c \
-				$(top_srcdir)/mysys/base64.c
+				$(top_srcdir)/mysys/base64.c \
+				sql_string.cc
 mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)
 
 mysqldump_SOURCES=              mysqldump.c \