summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2011-05-06 00:54:36 +0100
committerLuis Soares <luis.soares@oracle.com>2011-05-06 00:54:36 +0100
commit902e64dafe9cc5218ae4e03cf235a48798c7b325 (patch)
tree0339043e1abf49cbaa6d8719e4a5fb044d16e9f9 /client
parent8a08fd43411725545a61f16c5c78994d845f9352 (diff)
parent0efb452e5e3c201274755731d1867b309a34ae37 (diff)
downloadmariadb-git-902e64dafe9cc5218ae4e03cf235a48798c7b325.tar.gz
BUG#12354268
Automerged bzr bundle from bug report: luis.soares@oracle.com-20110505224815-6ob90n7suxsoizvs.bundle
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 30a8bddc17c..f451e28de86 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -951,7 +951,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)