Bug#24296291: FIX -WUNUSED-PARAMETER WARNINGS

Patch #5: Fix -Wunused-parameter warnings in Replication

Author: jhauglid

libbinlogevents/include/binlog_event.h

@@ -795,10 +795,8 @@ class Binary_log_event
 
     @param buf              Contains the serialized event
     @param binlog_version   The binary log format version
-    @param server_version   The MySQL server's version
   */
-  Binary_log_event(const char **buf, uint16_t binlog_version,
-                   const char *server_version);
+  Binary_log_event(const char **buf, uint16_t binlog_version);
 public:
 #ifndef HAVE_MYSYS
   /*

libbinlogevents/include/control_events.h

@@ -465,8 +465,7 @@ class Stop_event: public Binary_log_event
   */
   Stop_event(const char* buf,
              const Format_description_event *description_event)
-    :Binary_log_event(&buf, description_event->binlog_version,
-                      description_event->server_version)
+    :Binary_log_event(&buf, description_event->binlog_version)
   {}
 
 #ifndef HAVE_MYSYS
@@ -1201,7 +1200,6 @@ class Transaction_context_event : public Binary_log_event
     </pre>
 
     @param buffer             Contains the serialized event.
-    @param event_len          Length of the serialized event.
     @param description_event  An FDE event, used to get the
                               following information
                               -binlog_version
@@ -1211,7 +1209,7 @@ class Transaction_context_event : public Binary_log_event
                               The content of this object
                               depends on the binlog-version currently in use.
   */
-  Transaction_context_event(const char *buffer, unsigned int event_len,
+  Transaction_context_event(const char *buffer,
                             const Format_description_event *description_event);
 
   Transaction_context_event(unsigned int thread_id_arg,
@@ -1310,7 +1308,6 @@ class View_change_event : public Binary_log_event
     </pre>
 
     @param buf                Contains the serialized event.
-    @param event_len          Length of the serialized event.
     @param descr_event        An FDE event, used to get the
                               following information
                               -binlog_version
@@ -1320,7 +1317,7 @@ class View_change_event : public Binary_log_event
                               The content of this object
                               depends on the binlog-version currently in use.
   */
-  View_change_event(const char *buf, unsigned int event_len,
+  View_change_event(const char *buf,
                     const Format_description_event *descr_event);
 
   explicit View_change_event(char* raw_view_id);

libbinlogevents/include/statement_events.h

@@ -615,8 +615,7 @@ class Query_event: public Binary_log_event
               unsigned long auto_increment_offset_arg,
               unsigned int number,
               unsigned long long table_map_for_update_arg,
-              int errcode,
-              unsigned int db_arg_len, unsigned int catalog_arg_len);
+              int errcode);
 
   /**
     The constructor receives a buffer and instantiates a Query_event filled in

libbinlogevents/src/binlog_event.cpp

@@ -283,8 +283,7 @@ bool Log_event_footer::event_checksum_test(unsigned char *event_buf,
   the constructor of Log_event_header) and
   will be pointing to the start of event data
 */
-Binary_log_event::Binary_log_event(const char **buf, uint16_t binlog_version,
-                                   const char *server_version)
+Binary_log_event::Binary_log_event(const char **buf, uint16_t binlog_version)
 : m_header(*buf, binlog_version)
 {
   m_footer= Log_event_footer();
@@ -317,8 +316,7 @@ Binary_log_event::~Binary_log_event()
 Unknown_event::Unknown_event(const char* buf,
                 const Format_description_event *description_event)
   : Binary_log_event(&buf,
-                     description_event->binlog_version,
-                     description_event->server_version)
+                     description_event->binlog_version)
   {
   }
 #ifndef HAVE_MYSYS

libbinlogevents/src/control_events.cpp

@@ -30,9 +30,8 @@ namespace binary_log
 */
 Rotate_event::Rotate_event(const char* buf, unsigned int event_len,
                            const Format_description_event *description_event)
-: Binary_log_event(&buf, description_event->binlog_version,
-                   description_event->server_version), new_log_ident(0),
-  flags(DUP_NAME)
+: Binary_log_event(&buf, description_event->binlog_version),
+  new_log_ident(0), flags(DUP_NAME)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -268,8 +267,8 @@ bool Format_description_event::is_version_before_checksum() const
 
 Start_event_v3::Start_event_v3(const char* buf, unsigned int event_len,
                                const Format_description_event *description_event)
-  :Binary_log_event(&buf, description_event->binlog_version,
-   description_event->server_version), binlog_version(BINLOG_VERSION)
+  :Binary_log_event(&buf, description_event->binlog_version),
+   binlog_version(BINLOG_VERSION)
 {
   if (event_len < (unsigned int)description_event->common_header_len +
       ST_COMMON_HEADER_LEN_OFFSET)
@@ -466,8 +465,7 @@ Format_description_event::~Format_description_event()
 */
 Incident_event::Incident_event(const char *buf, unsigned int event_len,
                                const Format_description_event *descr_event)
-: Binary_log_event(&buf, descr_event->binlog_version,
-                   descr_event->server_version)
+: Binary_log_event(&buf, descr_event->binlog_version)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -529,8 +527,7 @@ Incident_event::Incident_event(const char *buf, unsigned int event_len,
 
 Ignorable_event::Ignorable_event(const char *buf,
                                  const Format_description_event *descr_event)
- : Binary_log_event(&buf, descr_event->binlog_version,
-                    descr_event->server_version)
+ : Binary_log_event(&buf, descr_event->binlog_version)
 {}
 
 /**
@@ -544,8 +541,7 @@ Ignorable_event::Ignorable_event(const char *buf,
 Xid_event::
 Xid_event(const char* buf,
           const Format_description_event *description_event)
-  :Binary_log_event(&buf, description_event->binlog_version,
-                    description_event->server_version)
+  :Binary_log_event(&buf, description_event->binlog_version)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -569,8 +565,7 @@ Xid_event(const char* buf,
 XA_prepare_event::
 XA_prepare_event(const char* buf,
                  const Format_description_event *description_event)
- : Binary_log_event(&buf, description_event->binlog_version,
-                    description_event->server_version)
+ : Binary_log_event(&buf, description_event->binlog_version)
 {
   uint32_t temp= 0;
   uint8_t temp_byte;
@@ -596,8 +591,7 @@ XA_prepare_event(const char* buf,
 */
 Gtid_event::Gtid_event(const char *buffer, uint32_t event_len,
                        const Format_description_event *description_event)
- : Binary_log_event(&buffer, description_event->binlog_version,
-                    description_event->server_version),
+ : Binary_log_event(&buffer, description_event->binlog_version),
     last_committed(SEQ_UNINIT), sequence_number(SEQ_UNINIT)
 {
   /*
@@ -662,8 +656,7 @@ Gtid_event::Gtid_event(const char *buffer, uint32_t event_len,
 Previous_gtids_event::
 Previous_gtids_event(const char *buffer, unsigned int event_len,
                      const Format_description_event *description_event)
-: Binary_log_event(&buffer, description_event->binlog_version,
-                     description_event->server_version)
+: Binary_log_event(&buffer, description_event->binlog_version)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -684,10 +677,9 @@ Previous_gtids_event(const char *buffer, unsigned int event_len,
   in this event.
 */
 Transaction_context_event::
-Transaction_context_event(const char *buffer, unsigned int event_len,
+Transaction_context_event(const char *buffer,
                           const Format_description_event *description_event)
-: Binary_log_event(&buffer, description_event->binlog_version,
-                   description_event->server_version)
+: Binary_log_event(&buffer, description_event->binlog_version)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -814,10 +806,9 @@ View_change_event::View_change_event(char* raw_view_id)
 }
 
 View_change_event::
-View_change_event(const char *buffer, unsigned int event_len,
+View_change_event(const char *buffer,
                   const Format_description_event *description_event)
-: Binary_log_event(&buffer, description_event->binlog_version,
-                   description_event->server_version),
+: Binary_log_event(&buffer, description_event->binlog_version),
   view_id(), seq_number(0), certification_info()
 {
   //buf is advanced in Binary_log_event constructor to point to
@@ -892,8 +883,7 @@ View_change_event::~View_change_event()
 Heartbeat_event::Heartbeat_event(const char* buf, unsigned int event_len,
                                  const Format_description_event*
                                  description_event)
-: Binary_log_event(&buf, description_event->binlog_version,
-                   description_event->server_version),
+: Binary_log_event(&buf, description_event->binlog_version),
   log_ident(buf)
 {
   //buf is advanced in Binary_log_event constructor to point to

libbinlogevents/src/load_data_events.cpp

@@ -70,8 +70,8 @@ Execute_load_query_event(const char* buf,
 Delete_file_event::Delete_file_event(const char* buf, unsigned int len,
                                      const Format_description_event*
                                      description_event)
-: Binary_log_event(&buf, description_event->binlog_version,
-                    description_event->server_version), file_id(0)
+: Binary_log_event(&buf, description_event->binlog_version),
+  file_id(0)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -92,8 +92,8 @@ Delete_file_event::Delete_file_event(const char* buf, unsigned int len,
 Append_block_event::Append_block_event(const char* buf, unsigned int len,
                                        const Format_description_event*
                                        description_event)
-: Binary_log_event(&buf, description_event->binlog_version,
-                    description_event->server_version), block(0)
+: Binary_log_event(&buf, description_event->binlog_version),
+  block(0)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header

libbinlogevents/src/rows_event.cpp

@@ -69,8 +69,7 @@ static unsigned long get_field_length(unsigned char **packet)
 Table_map_event::Table_map_event(const char *buf, unsigned int event_len,
                                  const Format_description_event*
                                  description_event)
-  : Binary_log_event(&buf, description_event->binlog_version,
-                     description_event->server_version),
+  : Binary_log_event(&buf, description_event->binlog_version),
     m_table_id(0), m_flags(0), m_data_size(0),
     m_dbnam(""), m_dblen(0), m_tblnam(""), m_tbllen(0),
     m_colcnt(0), m_field_metadata_size(0), m_field_metadata(0), m_null_bits(0)
@@ -166,8 +165,7 @@ Table_map_event::~Table_map_event()
 *****************************************************************************/
 Rows_event::Rows_event(const char *buf, unsigned int event_len,
                        const Format_description_event *description_event)
-  : Binary_log_event(&buf, description_event->binlog_version,
-                     description_event->server_version),
+  : Binary_log_event(&buf, description_event->binlog_version),
     m_table_id(0), m_width(0), m_extra_row_data(0),
     columns_before_image(0), columns_after_image(0), row(0)
 {

libbinlogevents/src/statement_events.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,8 +47,7 @@ Query_event::Query_event(const char* query_arg, const char* catalog_arg,
                          unsigned long auto_increment_offset_arg,
                          unsigned int number,
                          unsigned long long table_map_for_update_arg,
-                         int errcode,
-                         unsigned int db_arg_len, unsigned int catalog_arg_len)
+                         int errcode)
 : Binary_log_event(QUERY_EVENT),
   query(query_arg), db(db_arg), catalog(catalog_arg),
   user(0), user_len(0), host(0), host_len(0),
@@ -109,8 +108,7 @@ static void copy_str_and_move(Log_event_header::Byte **dst,
 Query_event::Query_event(const char* buf, unsigned int event_len,
                          const Format_description_event *description_event,
                          Log_event_type event_type)
-: Binary_log_event(&buf, description_event->binlog_version,
-                   description_event->server_version),
+: Binary_log_event(&buf, description_event->binlog_version),
   query(0), db(0), catalog(0), time_zone_str(0),
   user(0), user_len(0), host(0), host_len(0),
   db_len(0), status_vars_len(0), q_len(0),
@@ -446,8 +444,7 @@ int Query_event::fill_data_buf(Log_event_header::Byte* buf,
 User_var_event::
 User_var_event(const char* buf, unsigned int event_len,
                const Format_description_event* description_event)
-  :Binary_log_event(&buf, description_event->binlog_version,
-                    description_event->server_version)
+  :Binary_log_event(&buf, description_event->binlog_version)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -563,8 +560,7 @@ User_var_event(const char* buf, unsigned int event_len,
 */
 Intvar_event::Intvar_event(const char* buf,
                            const Format_description_event* description_event)
-: Binary_log_event(&buf, description_event->binlog_version,
-                   description_event->server_version)
+: Binary_log_event(&buf, description_event->binlog_version)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
@@ -577,8 +573,7 @@ Intvar_event::Intvar_event(const char* buf,
 
 Rand_event::Rand_event(const char* buf,
                        const Format_description_event* description_event)
-  :Binary_log_event(&buf, description_event->binlog_version,
-                    description_event->server_version)
+  :Binary_log_event(&buf, description_event->binlog_version)
 {
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header