diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-30 18:57:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-30 18:58:56 +0200 |
| commit | 52c3afd4ca83742667c24c6d0b7188b607e779eb (patch) | |
| tree | e64ffab79ece1067f47e931287d84438bef37164 | |
| parent | b5689c6c872dc73d55c8150bcdc221fd04647a04 (diff) | |
| download | mariadb-git-52c3afd4ca83742667c24c6d0b7188b607e779eb.tar.gz | |
Fix a type mismatch introduced by the merge commit e0a1c745ec3ed1ec6c0375a2a624697c29f480a6
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 24b7fe38b99..2a9e6493c5e 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -8673,7 +8673,7 @@ User_var_log_event(const char* buf, uint event_len, Old events will not have this extra byte, thence, we keep the flags set to UNDEF_F. */ - uint bytes_read= (uint)((val + val_len) - buf_start); + size_t bytes_read= ((val + val_len) - buf_start); if ((data_written - bytes_read) > 0) { flags= (uint) *(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE + |