diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-10-19 09:06:17 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-10-19 09:06:17 +0300 |
| commit | 8da6b4ef5260179b1577843517c46e4b95a9e911 (patch) | |
| tree | f3194a3065a220aa37ff14ce478fa6eed72e5be6 /sql/log_event.cc | |
| parent | 2b811f0624c46469185ff4d93bd8f184e1f7ac92 (diff) | |
| parent | b000e169562697aa072600695d4f0c0412f94f4f (diff) | |
| download | mariadb-git-8da6b4ef5260179b1577843517c46e4b95a9e911.tar.gz | |
Merge tag 'mariadb-5.5.58' into 5.5-galera
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index cd6b780cb0e..9ec76051b06 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6476,21 +6476,6 @@ User_var_log_event(const char* buf, uint event_len, we keep the flags set to UNDEF_F. */ uint bytes_read= ((val + val_len) - start); -#ifndef DBUG_OFF - bool old_pre_checksum_fd= description_event->is_version_before_checksum( - &description_event->server_version_split); -#endif - DBUG_ASSERT((bytes_read == data_written - - (old_pre_checksum_fd || - (description_event->checksum_alg == - BINLOG_CHECKSUM_ALG_OFF)) ? - 0 : BINLOG_CHECKSUM_LEN) - || - (bytes_read == data_written -1 - - (old_pre_checksum_fd || - (description_event->checksum_alg == - BINLOG_CHECKSUM_ALG_OFF)) ? - 0 : BINLOG_CHECKSUM_LEN)); if ((data_written - bytes_read) > 0) { flags= (uint) *(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE + |