Commit 5ca905a6 authored by unknown's avatar unknown
Browse files

Fixing compile problem on some platforms resulting from building a 

configuration with HAVE_REPLICATION undefined, which causes the
*_rows_log_event_old classes to only have a default constructor. This
generates an error on some platforms, since the base classes does 
not have a default constructor defined.

Updating signatures of do_prepare_row() for classes above, since
signatures in base classes changed.


sql/log_event_old.h:
  Adding constructor since when HAVE_REPLICATION is not defined, the
  class will not have any constructor, which generates an error on
  some platforms.  Updating signature of do_prepare_row() since
  signature changed in base classes.
parent d54c905f

sql/log_event_old.h

+24 −3
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ class Write_rows_log_event_old : public Write_rows_log_event 
    TYPE_CODE = PRE_GA_WRITE_ROWS_EVENT

  };



#if !defined(MYSQL_CLIENT)

  Write_rows_log_event_old(THD *thd, TABLE *table, ulong table_id,

                           MY_BITMAP const *cols, bool is_transactional)

    : Write_rows_log_event(thd, table, table_id, cols, is_transactional)

  {

  }

#endif

#if defined(HAVE_REPLICATION)

  Write_rows_log_event_old(const char *buf, uint event_len,

                           const Format_description_log_event *descr)
@@ -27,7 +34,7 @@ class Write_rows_log_event_old : public Write_rows_log_event 
  virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; }



#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)

  virtual int do_prepare_row(THD*, RELAY_LOG_INFO*, TABLE*,

  virtual int do_prepare_row(THD*, RELAY_LOG_INFO const*, TABLE*,

                             char const *row_start, char const **row_end);

#endif

};
@@ -42,6 +49,13 @@ class Update_rows_log_event_old : public Update_rows_log_event 
    TYPE_CODE = PRE_GA_UPDATE_ROWS_EVENT

  };



#if !defined(MYSQL_CLIENT)

  Update_rows_log_event_old(THD *thd, TABLE *table, ulong table_id,

                           MY_BITMAP const *cols, bool is_transactional)

    : Update_rows_log_event(thd, table, table_id, cols, is_transactional)

  {

  }

#endif

#if defined(HAVE_REPLICATION)

  Update_rows_log_event_old(const char *buf, uint event_len, 

                            const Format_description_log_event *descr)
@@ -54,7 +68,7 @@ class Update_rows_log_event_old : public Update_rows_log_event 
  virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; }



#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)

  virtual int do_prepare_row(THD*, RELAY_LOG_INFO*, TABLE*,

  virtual int do_prepare_row(THD*, RELAY_LOG_INFO const*, TABLE*,

                             char const *row_start, char const **row_end);

#endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */

};
@@ -69,6 +83,13 @@ class Delete_rows_log_event_old : public Delete_rows_log_event 
    TYPE_CODE = PRE_GA_DELETE_ROWS_EVENT

  };



#if !defined(MYSQL_CLIENT)

  Delete_rows_log_event_old(THD *thd, TABLE *table, ulong table_id,

                           MY_BITMAP const *cols, bool is_transactional)

    : Delete_rows_log_event(thd, table, table_id, cols, is_transactional)

  {

  }

#endif

#if defined(HAVE_REPLICATION)

  Delete_rows_log_event_old(const char *buf, uint event_len,

                            const Format_description_log_event *descr)
@@ -81,7 +102,7 @@ class Delete_rows_log_event_old : public Delete_rows_log_event 
  virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; }



#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)

  virtual int do_prepare_row(THD*, RELAY_LOG_INFO*, TABLE*,

  virtual int do_prepare_row(THD*, RELAY_LOG_INFO const*, TABLE*,

                             char const *row_start, char const **row_end);

#endif

};