diff options
author | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-02-11 14:36:24 +0200 |
---|---|---|
committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-02-11 15:32:45 +0200 |
commit | fa57e118445735fce44565b7dea48ec8bf86bbe4 (patch) | |
tree | 5744271b0504c669a06f2358074bb1c5a6fa3096 /sql/log_event_old.cc | |
parent | 0cdcb5f0835d153ed5d06c40828bacdf7203a8da (diff) | |
download | mariadb-git-fa57e118445735fce44565b7dea48ec8bf86bbe4.tar.gz |
MDEV-10963 manual merge 10.1->10.3.
Diffstat (limited to 'sql/log_event_old.cc')
-rw-r--r-- | sql/log_event_old.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 67a3e54f2dd..b5381ec6d74 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -1851,6 +1851,7 @@ bool Old_rows_log_event::print_helper(FILE *file, IO_CACHE *const body= &print_event_info->body_cache; bool do_print_encoded= print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS && + print_event_info->base64_output_mode != BASE64_OUTPUT_NEVER && !print_event_info->short_form; if (!print_event_info->short_form) |