From 3f38ad6f4927e1d3bcf43faca8501df1e706405c Mon Sep 17 00:00:00 2001 From: agapple Date: Mon, 28 Nov 2016 14:10:57 +0800 Subject: [PATCH] fixed issue #227 , fixed binlog_checksum variables --- .../canal/parse/inbound/mysql/MysqlConnection.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java index a09ae326..c3c633d0 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java @@ -6,9 +6,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.List; -import com.taobao.tddl.dbsync.binlog.LogPosition; -import com.taobao.tddl.dbsync.binlog.event.FormatDescriptionLogEvent; - +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,6 +25,8 @@ import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.DirectLogFetcher; import com.taobao.tddl.dbsync.binlog.LogContext; import com.taobao.tddl.dbsync.binlog.LogDecoder; import com.taobao.tddl.dbsync.binlog.LogEvent; +import com.taobao.tddl.dbsync.binlog.LogPosition; +import com.taobao.tddl.dbsync.binlog.event.FormatDescriptionLogEvent; public class MysqlConnection implements ErosaConnection { @@ -207,7 +207,9 @@ public class MysqlConnection implements ErosaConnection { // '@@global.binlog_checksum'需要去掉单引号,在mysql 5.6.29下导致master退出 update("set @master_binlog_checksum= @@global.binlog_checksum"); } catch (Exception e) { - logger.warn(ExceptionUtils.getFullStackTrace(e)); + if (!StringUtils.contains(e.getMessage(), "Unknown system variable")) { + logger.warn(ExceptionUtils.getFullStackTrace(e)); + } } try {