Merge pull request #1484 from liulangwa/master

捕获"rs = query("select @@global.binlog_checksum")" 结果rs为null的异常
This commit is contained in:
agapple
2019-01-30 11:45:33 +08:00
committed by GitHub

View File

@@ -514,17 +514,16 @@ public class MysqlConnection implements ErosaConnection {
ResultSetPacket rs = null; ResultSetPacket rs = null;
try { try {
rs = query("select @@global.binlog_checksum"); rs = query("select @@global.binlog_checksum");
} catch (Throwable e) {
// ignore
return;
}
List<String> columnValues = rs.getFieldValues(); List<String> columnValues = rs.getFieldValues();
if (columnValues != null && columnValues.size() >= 1 && columnValues.get(0).toUpperCase().equals("CRC32")) { if (columnValues != null && columnValues.size() >= 1 && columnValues.get(0).toUpperCase().equals("CRC32")) {
binlogChecksum = LogEvent.BINLOG_CHECKSUM_ALG_CRC32; binlogChecksum = LogEvent.BINLOG_CHECKSUM_ALG_CRC32;
} else { } else {
binlogChecksum = LogEvent.BINLOG_CHECKSUM_ALG_OFF; binlogChecksum = LogEvent.BINLOG_CHECKSUM_ALG_OFF;
} }
} catch (Throwable e) {
logger.error("", e);
binlogChecksum = LogEvent.BINLOG_CHECKSUM_ALG_OFF;
}
} }
private void accumulateReceivedBytes(long x) { private void accumulateReceivedBytes(long x) {