diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-08 13:26:07 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-08 13:26:07 +0300 |
| commit | e843297d128b165125d17aab8958f7ca91808923 (patch) | |
| tree | 3d802b88637615d4b0c5ea9c44835d34f8354108 /sql/log_event.cc | |
| parent | 183d6b7025ae2c297e0bf24b928ab4afe2e91516 (diff) | |
| download | mariadb-git-e843297d128b165125d17aab8958f7ca91808923.tar.gz | |
Fixed compiler warnings
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 2e6cc281ce1..2a47be38d85 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -955,18 +955,17 @@ my_bool Log_event::need_checksum() { DBUG_ENTER("Log_event::need_checksum"); my_bool ret; - extern ulong binlog_checksum_options; /* few callers of Log_event::write (incl FD::write, FD constructing code on the slave side, Rotate relay log and Stop event) provides their checksum alg preference through Log_event::checksum_alg. */ - ret= (checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) ? - (checksum_alg != BINLOG_CHECKSUM_ALG_OFF) : - ((binlog_checksum_options != BINLOG_CHECKSUM_ALG_OFF) && - (cache_type == Log_event::EVENT_NO_CACHE))? binlog_checksum_options : - FALSE; + ret= ((checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) ? + (checksum_alg != BINLOG_CHECKSUM_ALG_OFF) : + ((binlog_checksum_options != BINLOG_CHECKSUM_ALG_OFF) && + (cache_type == Log_event::EVENT_NO_CACHE)) ? + test(binlog_checksum_options) : FALSE); /* FD calls the methods before data_written has been calculated. @@ -980,7 +979,7 @@ my_bool Log_event::need_checksum() if (checksum_alg == BINLOG_CHECKSUM_ALG_UNDEF) checksum_alg= ret ? // calculated value stored - binlog_checksum_options : (uint8) BINLOG_CHECKSUM_ALG_OFF; + (uint8) binlog_checksum_options : (uint8) BINLOG_CHECKSUM_ALG_OFF; DBUG_ASSERT(!ret || ((checksum_alg == binlog_checksum_options || |