mysqlbin --hexdump patch 3

client/mysqlbinlog.cc:
  Collapsing multiple arguments to print function into the last_event_info struct
sql/log_event.cc:
  Only print header is length=19 (otherwise print in standard hexdump format)
  Collapsing multiple arguments into last_event_info struct
sql/log_event.h:
  Collapsing multiple arguments into last_event_info struct

client/mysqlbinlog.cc

@@ -496,6 +496,7 @@ int process_event(LAST_EVENT_INFO *last_event_info, Log_event *ev,
   char ll_buff[21];
   Log_event_type ev_type= ev->get_type_code();
   DBUG_ENTER("process_event");
+  last_event_info->short_form= short_form;
 
   /*
     Format events are not concerned by --offset and such, we always need to
@@ -524,14 +525,16 @@ int process_event(LAST_EVENT_INFO *last_event_info, Log_event *ev,
     if (!short_form)
       fprintf(result_file, "# at %s\n",llstr(pos,ll_buff));
 
-    /* Set pos to 0 if hexdump is disabled */
-    if (!opt_hexdump) pos= 0;
+    if (!opt_hexdump)
+      last_event_info->hexdump_from= 0; /* Disabled */
+    else
+      last_event_info->hexdump_from= pos;
 
     switch (ev_type) {
     case QUERY_EVENT:
       if (check_database(((Query_log_event*)ev)->db))
         goto end;
-      ev->print(result_file, short_form, pos, last_event_info);
+      ev->print(result_file, last_event_info);
       break;
     case CREATE_FILE_EVENT:
     {
@@ -551,7 +554,7 @@ int process_event(LAST_EVENT_INFO *last_event_info, Log_event *ev,
 	filename and use LOCAL), prepared in the 'case EXEC_LOAD_EVENT' 
 	below.
       */
-      ce->print(result_file, short_form, pos, last_event_info, TRUE);
+      ce->print(result_file, last_event_info, TRUE);
 
       // If this binlog is not 3.23 ; why this test??
       if (description_event->binlog_version >= 3)
@@ -563,13 +566,13 @@ int process_event(LAST_EVENT_INFO *last_event_info, Log_event *ev,
       break;
     }
     case APPEND_BLOCK_EVENT:
-      ev->print(result_file, short_form, pos, last_event_info);
+      ev->print(result_file, last_event_info);
       if (load_processor.process((Append_block_log_event*) ev))
 	break;					// Error
       break;
     case EXEC_LOAD_EVENT:
     {
-      ev->print(result_file, short_form, pos, last_event_info);
+      ev->print(result_file, last_event_info);
       Execute_load_log_event *exv= (Execute_load_log_event*)ev;
       Create_file_log_event *ce= load_processor.grab_event(exv->file_id);
       /*
@@ -579,7 +582,7 @@ int process_event(LAST_EVENT_INFO *last_event_info, Log_event *ev,
       */
       if (ce)
       {
-	ce->print(result_file, short_form, pos, last_event_info, TRUE);
+	ce->print(result_file, last_event_info, TRUE);
 	my_free((char*)ce->fname,MYF(MY_WME));
 	delete ce;
       }
@@ -591,7 +594,8 @@ Create_file event for file_id: %u\n",exv->file_id);
     case FORMAT_DESCRIPTION_EVENT:
       delete description_event;
       description_event= (Format_description_log_event*) ev;
-      ev->print(result_file, short_form, pos, last_event_info);
+      last_event_info->common_header_len= description_event->common_header_len;
+      ev->print(result_file, last_event_info);
       /*
         We don't want this event to be deleted now, so let's hide it (I
         (Guilhem) should later see if this triggers a non-serious Valgrind
@@ -601,7 +605,7 @@ Create_file event for file_id: %u\n",exv->file_id);
       ev= 0;
       break;
     case BEGIN_LOAD_QUERY_EVENT:
-      ev->print(result_file, short_form, pos, last_event_info);
+      ev->print(result_file, last_event_info);
       load_processor.process((Begin_load_query_log_event*) ev);
       break;
     case EXECUTE_LOAD_QUERY_EVENT:
@@ -618,7 +622,7 @@ Create_file event for file_id: %u\n",exv->file_id);
 
       if (fname)
       {
-	exlq->print(result_file, short_form, pos, last_event_info, fname);
+	exlq->print(result_file, last_event_info, fname);
 	my_free(fname, MYF(MY_WME));
       }
       else
@@ -627,7 +631,7 @@ Begin_load_query event for file_id: %u\n", exlq->file_id);
       break;
     }
     default:
-      ev->print(result_file, short_form, pos, last_event_info);
+      ev->print(result_file, last_event_info);
     }
   }
 

sql/log_event.h

@@ -451,12 +451,18 @@ struct st_relay_log_info;
 
 #ifdef MYSQL_CLIENT
 /*
-  A structure for mysqlbinlog to remember the last db, flags2, sql_mode etc; it
-  is passed to events' print() methods, so that they print only the necessary
-  USE and SET commands.
+  A structure for mysqlbinlog to know how to print events
+
+  This structure is passed to the event's print() methods so that only
+  the necessary USE and SET commands are printed.  Last db, flags2,
+  sql_mode etc are stored here.
+
+  The structure also contain other information on how to print the
+  events, e.g. short_form, hexdump_from.
 */
 typedef struct st_last_event_info
 {
+  /* Old settings for database, sql_mode etc */
   // TODO: have the last catalog here ??
   char db[FN_REFLEN+1]; // TODO: make this a LEX_STRING when thd->db is
   bool flags2_inited;
@@ -480,6 +486,12 @@ typedef struct st_last_event_info
       bzero(charset, sizeof(charset));
       bzero(time_zone_str, sizeof(time_zone_str));
     }
+
+  /* Settings on how to print the events */
+  bool short_form;
+  my_off_t hexdump_from;
+  uint8 common_header_len;
+
 } LAST_EVENT_INFO;
 #endif
 
@@ -589,10 +601,9 @@ class Log_event
   static Log_event* read_log_event(IO_CACHE* file,
                                    const Format_description_log_event *description_event);
   /* print*() functions are used by mysqlbinlog */
-  virtual void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-		     LAST_EVENT_INFO* last_event_info= 0) = 0;
+  virtual void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0) = 0;
   void print_timestamp(FILE* file, time_t *ts = 0);
-  void print_header(FILE* file, my_off_t hexdump_from= 0);
+  void print_header(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   static void *operator new(size_t size)
@@ -752,11 +763,8 @@ class Query_log_event: public Log_event
                  uint32 q_len_arg);
 #endif /* HAVE_REPLICATION */
 #else
-  void print_query_header(FILE* file, bool short_form= 0,
-			  my_off_t hexdump_from= 0,
-			  LAST_EVENT_INFO* last_event_info= 0);
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print_query_header(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Query_log_event(const char* buf, uint event_len,
@@ -810,8 +818,7 @@ class Slave_log_event: public Log_event
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Slave_log_event(const char* buf, uint event_len);
@@ -899,10 +906,8 @@ class Load_log_event: public Log_event
 		 bool use_rli_only_for_errors);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info = 0);
-  void print(FILE* file, bool short_form, my_off_t hexdump_from,
-	     LAST_EVENT_INFO* last_event_info, bool commented);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info = 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info, bool commented);
 #endif
 
   /*
@@ -991,8 +996,7 @@ class Start_log_event_v3: public Log_event
 #endif /* HAVE_REPLICATION */
 #else
   Start_log_event_v3() {}
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Start_log_event_v3(const char* buf,
@@ -1087,8 +1091,7 @@ class Intvar_log_event: public Log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Intvar_log_event(const char* buf, const Format_description_log_event* description_event);
@@ -1129,8 +1132,7 @@ class Rand_log_event: public Log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Rand_log_event(const char* buf, const Format_description_log_event* description_event);
@@ -1167,8 +1169,7 @@ class Xid_log_event: public Log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Xid_log_event(const char* buf, const Format_description_log_event* description_event);
@@ -1210,8 +1211,7 @@ class User_var_log_event: public Log_event
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   User_var_log_event(const char* buf, const Format_description_log_event* description_event);
@@ -1237,8 +1237,7 @@ class Stop_log_event: public Log_event
   {}
   int exec_event(struct st_relay_log_info* rli);
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Stop_log_event(const char* buf, const Format_description_log_event* description_event):
@@ -1277,8 +1276,7 @@ class Rotate_log_event: public Log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Rotate_log_event(const char* buf, uint event_len,
@@ -1331,10 +1329,8 @@ class Create_file_log_event: public Load_log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
-  void print(FILE* file, bool short_form, my_off_t hexdump_from,
-	     LAST_EVENT_INFO* last_event_info, bool enable_local);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info, bool enable_local);
 #endif
 
   Create_file_log_event(const char* buf, uint event_len,
@@ -1401,8 +1397,7 @@ class Append_block_log_event: public Log_event
   virtual int get_create_or_append() const;
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Append_block_log_event(const char* buf, uint event_len,
@@ -1437,10 +1432,8 @@ class Delete_file_log_event: public Log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
-  void print(FILE* file, bool short_form, my_off_t hexdump_from,
-	     LAST_EVENT_INFO* last_event_info, bool enable_local);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info, bool enable_local);
 #endif
 
   Delete_file_log_event(const char* buf, uint event_len,
@@ -1475,8 +1468,7 @@ class Execute_load_log_event: public Log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
 #endif
 
   Execute_load_log_event(const char* buf, uint event_len,
@@ -1561,11 +1553,10 @@ class Execute_load_query_log_event: public Query_log_event
   int exec_event(struct st_relay_log_info* rli);
 #endif /* HAVE_REPLICATION */
 #else
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-             LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
   /* Prints the query as LOAD DATA LOCAL and with rewritten filename */
-  void print(FILE* file, bool short_form, my_off_t hexdump_from,
-	     LAST_EVENT_INFO* last_event_info, const char *local_fname);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info,
+	     const char *local_fname);
 #endif
   Execute_load_query_log_event(const char* buf, uint event_len,
                                const Format_description_log_event *description_event);
@@ -1594,8 +1585,7 @@ class Unknown_log_event: public Log_event
     Log_event(buf, description_event)
   {}
   ~Unknown_log_event() {}
-  void print(FILE* file, bool short_form= 0, my_off_t hexdump_from= 0,
-	     LAST_EVENT_INFO* last_event_info= 0);
+  void print(FILE* file, LAST_EVENT_INFO* last_event_info= 0);
   Log_event_type get_type_code() { return UNKNOWN_EVENT;}
   bool is_valid() const { return 1; }
 };