mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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.
This commit is contained in:
@ -15,6 +15,13 @@ public:
|
||||
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 @@ private:
|
||||
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 @@ public:
|
||||
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 @@ private:
|
||||
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 @@ public:
|
||||
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 @@ private:
|
||||
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
|
||||
};
|
||||
|
Reference in New Issue
Block a user