diff options
| author | Luis Soares <luis.soares@oracle.com> | 2011-05-06 00:55:44 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2011-05-06 00:55:44 +0100 |
| commit | 6875f4df30209c8682e37db03a163d596394809e (patch) | |
| tree | 54c57f25c5a7fd376c56a441e86f3a21a3be4df0 /client/mysqlbinlog.cc | |
| parent | a85150c36488c277b1cf1d0df3554f949f9a75a6 (diff) | |
| parent | 902e64dafe9cc5218ae4e03cf235a48798c7b325 (diff) | |
| download | mariadb-git-6875f4df30209c8682e37db03a163d596394809e.tar.gz | |
BUG#12354268
Automerge from mysql-5.1 into mysql-5.5.
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index e8a37ecfe5f..b374fa748b9 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -966,7 +966,8 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, passed --short-form, because --short-form disables printing row events. */ - if (!print_event_info->printed_fd_event && !short_form) + if (!print_event_info->printed_fd_event && !short_form && + opt_base64_output_mode != BASE64_OUTPUT_DECODE_ROWS) { const char* type_str= ev->get_type_str(); if (opt_base64_output_mode == BASE64_OUTPUT_NEVER) |