From 0c9eecd758a8cba0f218a121f83d3e8f01c4dee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BB=BA=E5=AE=89?= Date: Thu, 29 Sep 2016 17:21:59 +0800 Subject: [PATCH] =?UTF-8?q?mysql5.6.29'@@global.binlog=5Fchecksum'?= =?UTF-8?q?=E5=B8=A6=E5=8D=95=E5=BC=95=E5=8F=B7=E5=AF=BC=E8=87=B4master?= =?UTF-8?q?=E9=80=80=E5=87=BA,=E4=BC=98=E5=8C=96binlogFormat=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otter/canal/parse/inbound/mysql/MysqlConnection.java | 3 ++- .../otter/canal/parse/inbound/mysql/MysqlEventParser.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 5e19c1d4..2963df93 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 @@ -199,7 +199,8 @@ public class MysqlConnection implements ErosaConnection { // 如果不设置会出现错误： Slave can not handle replication events with the // checksum that master is configured to log // 但也不能乱设置，需要和mysql server的checksum配置一致，不然RotateLogEvent会出现乱码 - update("set @master_binlog_checksum= '@@global.binlog_checksum'"); + // '@@global.binlog_checksum'需要去掉单引号,在mysql 5.6.29下导致master退出 + update("set @master_binlog_checksum= @@global.binlog_checksum"); } catch (Exception e) { logger.warn(ExceptionUtils.getFullStackTrace(e)); } diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java index 548df70c..ca892a9f 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java @@ -93,6 +93,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE for (BinlogFormat supportFormat : supportBinlogFormats) { if (supportFormat != null && format == supportFormat) { found = true; + break; } } @@ -107,6 +108,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE for (BinlogImage supportImage : supportBinlogImages) { if (supportImage != null && image == supportImage) { found = true; + break; } }