summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2010-10-13 11:08:39 +0100
committerLuis Soares <luis.soares@oracle.com>2010-10-13 11:08:39 +0100
commite760a4d8ab820e5072149b2c1e86bb0a42f85171 (patch)
tree90e5328b77e8ac5eaa6a6938d7004247e331c7b7 /sql/log_event.h
parent609bc2c4077f4c1244763a796aa52a5d9d363e15 (diff)
parent54c308d37d4c1485cacc204ce845b665dc981579 (diff)
downloadmariadb-git-e760a4d8ab820e5072149b2c1e86bb0a42f85171.tar.gz
Automerge from mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 5d7250d8ebd..f58e1064d32 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1846,7 +1846,9 @@ public:
void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
#endif
- Slave_log_event(const char* buf, uint event_len);
+ Slave_log_event(const char* buf,
+ uint event_len,
+ const Format_description_log_event *description_event);
~Slave_log_event();
int get_data_size();
bool is_valid() const { return master_host != 0; }