add config of mysql charset

canal/canal.go

@@ -103,7 +103,7 @@ func (c *Canal) prepareDumper() error {
 
  charset := c.cfg.Charset
  if len(charset) == 0 {
- c.dumper.SetCharset(DEFAULT_CHARSET)
+ c.dumper.SetCharset(mysql.DEFAULT_CHARSET)
  }else {
  c.dumper.SetCharset(charset)
  }
@@ -273,13 +273,14 @@ func (c *Canal) prepareSyncer() error {
 Port: uint16(port),
 User: c.cfg.User,
 Password: c.cfg.Password,
+ Charset : c.cfg.Charset,
 }
 
 c.syncer = replication.NewBinlogSyncer(&cfg)
 
- if len(c.cfg.Charset) != 0 {
- c.syncer.c.setCharset(c.cfg.Charset)
- }
+ //if len(c.cfg.Charset) != 0 {
+ // c.syncer.c.setCharset(c.cfg.Charset)
+ //}
 
 return nil
 }

replication/binlogsyncer.go

@@ -40,6 +40,9 @@ type BinlogSyncerConfig struct {
 // If not set, use os.Hostname() instead.
 Localhost string
 
+// Charset is for MySQL client character set
+Charset string
+
 // SemiSyncEnabled enables semi-sync or not.
 SemiSyncEnabled bool
 
@@ -143,6 +146,9 @@ func (b *BinlogSyncer) registerSlave() error {
 if err != nil {
 return errors.Trace(err)
 }
+if len(b.cfg.Charset) != 0 {
+ b.c.SetCharset(b.cfg.Charset)
+}
 
 //for mysql 5.6+, binlog has a crc32 checksum
 //before mysql 5.6, this will not work, don't matter.:-)