diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 00:44:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:52 +0200 |
| commit | 86b06a0e52b7583858df81fec8bd57cfe02b9999 (patch) | |
| tree | 54859ffc5fa3daafed4d937a7b017fa7394b5154 /sql/log.cc | |
| parent | 7b54dec1c68ee70a8b0a56b6fb9bc3aa27256438 (diff) | |
| download | mariadb-git-86b06a0e52b7583858df81fec8bd57cfe02b9999.tar.gz | |
cleanup: simplify nested multiline ?(?:(?:)):
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sql/log.cc b/sql/log.cc index f8f4162cd44..6cf10a72ddf 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3445,17 +3445,18 @@ bool MYSQL_BIN_LOG::open(const char *log_name, */ if (io_cache_type == WRITE_CACHE) s.flags |= LOG_EVENT_BINLOG_IN_USE_F; - s.checksum_alg= is_relay_log ? - /* relay-log */ - /* inherit master's A descriptor if one has been received */ - (relay_log_checksum_alg= - (relay_log_checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) ? - relay_log_checksum_alg : - /* otherwise use slave's local preference of RL events verification */ - (opt_slave_sql_verify_checksum == 0) ? - (uint8) BINLOG_CHECKSUM_ALG_OFF : (uint8) binlog_checksum_options): - /* binlog */ - (uint8) binlog_checksum_options; + + if (is_relay_log) + { + if (relay_log_checksum_alg == BINLOG_CHECKSUM_ALG_UNDEF) + relay_log_checksum_alg= + opt_slave_sql_verify_checksum ? (uint8) binlog_checksum_options + : (uint8) BINLOG_CHECKSUM_ALG_OFF; + s.checksum_alg= relay_log_checksum_alg; + } + else + s.checksum_alg= (uint8) binlog_checksum_options; + DBUG_ASSERT(s.checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF); if (!s.is_valid()) goto err; |