Commit 7f279ae5 authored by mats@romeo.(none)'s avatar mats@romeo.(none)

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.
parent df53e89f
...@@ -15,6 +15,13 @@ public: ...@@ -15,6 +15,13 @@ public:
TYPE_CODE = PRE_GA_WRITE_ROWS_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) #if defined(HAVE_REPLICATION)
Write_rows_log_event_old(const char *buf, uint event_len, Write_rows_log_event_old(const char *buf, uint event_len,
const Format_description_log_event *descr) const Format_description_log_event *descr)
...@@ -27,7 +34,7 @@ private: ...@@ -27,7 +34,7 @@ private:
virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; } virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; }
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #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); char const *row_start, char const **row_end);
#endif #endif
}; };
...@@ -42,6 +49,13 @@ public: ...@@ -42,6 +49,13 @@ public:
TYPE_CODE = PRE_GA_UPDATE_ROWS_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) #if defined(HAVE_REPLICATION)
Update_rows_log_event_old(const char *buf, uint event_len, Update_rows_log_event_old(const char *buf, uint event_len,
const Format_description_log_event *descr) const Format_description_log_event *descr)
...@@ -54,7 +68,7 @@ private: ...@@ -54,7 +68,7 @@ private:
virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; } virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; }
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #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); char const *row_start, char const **row_end);
#endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */ #endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */
}; };
...@@ -69,6 +83,13 @@ public: ...@@ -69,6 +83,13 @@ public:
TYPE_CODE = PRE_GA_DELETE_ROWS_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) #if defined(HAVE_REPLICATION)
Delete_rows_log_event_old(const char *buf, uint event_len, Delete_rows_log_event_old(const char *buf, uint event_len,
const Format_description_log_event *descr) const Format_description_log_event *descr)
...@@ -81,7 +102,7 @@ private: ...@@ -81,7 +102,7 @@ private:
virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; } virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; }
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #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); char const *row_start, char const **row_end);
#endif #endif
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment