diff options
author | mats@romeo.(none) <> | 2007-04-13 11:19:31 +0200 |
---|---|---|
committer | mats@romeo.(none) <> | 2007-04-13 11:19:31 +0200 |
commit | 7f279ae5e93a8e5d1a8c7fe96f79c41110bf4e5c (patch) | |
tree | f87bd4df0d76de7f9585c2f298fc969c4b61d7ef /sql/log_event_old.h | |
parent | df53e89fca318eb85118ade892527cc80c02dd62 (diff) | |
download | mariadb-git-7f279ae5e93a8e5d1a8c7fe96f79c41110bf4e5c.tar.gz |
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.
Diffstat (limited to 'sql/log_event_old.h')
-rw-r--r-- | sql/log_event_old.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/sql/log_event_old.h b/sql/log_event_old.h index aad0f6cc6cd..18d17719a5a 100644 --- a/sql/log_event_old.h +++ b/sql/log_event_old.h @@ -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 }; |