dirty merge

1 files changed, 11 insertions, 5 deletions

diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc
index 66c4c2bef42..67a3e54f2dd 100644
--- a/sql/log_event_old.cc
+++ b/sql/log_event_old.cc
@@ -1842,27 +1842,33 @@ void Old_rows_log_event::pack_info(Protocol *protocol)
 
 
 #ifdef MYSQL_CLIENT
+/* Method duplicates Rows_log_event's one */
 bool Old_rows_log_event::print_helper(FILE *file,
                                       PRINT_EVENT_INFO *print_event_info,
                                       char const *const name)
 {
   IO_CACHE *const head= &print_event_info->head_cache;
   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->short_form;
+
   if (!print_event_info->short_form)
   {
-    bool const last_stmt_event= get_flags(STMT_END_F);
-    if (print_header(head, print_event_info, !last_stmt_event) ||
+    if (print_header(head, print_event_info, !do_print_encoded) ||
         my_b_printf(head, "\t%s: table id %lu%s\n",
                     name, m_table_id,
-                    last_stmt_event ? " flags: STMT_END_F" : "") ||
-        print_base64(body, print_event_info, !last_stmt_event))
+                    do_print_encoded ? " flags: STMT_END_F" : "") ||
+        print_base64(body, print_event_info, do_print_encoded))
       goto err;
   }
 
   if (get_flags(STMT_END_F))
   {
     if (copy_event_cache_to_file_and_reinit(head, file) ||
-        copy_event_cache_to_file_and_reinit(body, file))
+        copy_cache_to_file_wrapped(body, file, do_print_encoded,
+                                     print_event_info->delimiter,
+                                     print_event_info->verbose))
       goto err;
   }
   return 0;