diff options
| author | unknown <guilhem@mysql.com> | 2005-10-13 00:29:23 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-10-13 00:29:23 +0200 |
| commit | 16f3cb039416fff8551c77c1f28c6439a762c66c (patch) | |
| tree | 8c0b8caee1dd85a54979d11df0c0c8d57037a003 /sql/log_event.cc | |
| parent | bec380588e9b4ca0db056d91d352c25a5dc9aa77 (diff) | |
| download | mariadb-git-16f3cb039416fff8551c77c1f28c6439a762c66c.tar.gz | |
fixes after merge of 4.1.
mysql-test/r/subselect.result:
correcting non-ascii chars hosed by automerge as usual
mysql-test/t/subselect.test:
correcting non-ascii chars hosed by automerge as usual
sql/log_event.cc:
correcting bad manual merge. ZERO_LEN is not needed in 5.0, as ::exec_event() just tell()s the relay log instead
of using get_event_len().
sql/log_event.h:
get_event_len() is not needed in 5.0, ZERO_LEN neither.
sql/slave.cc:
fixes to take into account 5.0 specificities in replication. ZERO_LEN is not needed.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 4bfe502d77e..9bc62b30899 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2992,12 +2992,9 @@ Rotate_log_event::Rotate_log_event(THD* thd_arg, #endif -Rotate_log_event::Rotate_log_event(const char* buf, int event_len, - bool old_format) - :Log_event(buf, old_format), new_log_ident(0), flags(DUP_NAME) Rotate_log_event::Rotate_log_event(const char* buf, uint event_len, const Format_description_log_event* description_event) - :Log_event(buf, description_event) ,new_log_ident(NULL),alloced(0) + :Log_event(buf, description_event) ,new_log_ident(0), flags(DUP_NAME) { DBUG_ENTER("Rotate_log_event::Rotate_log_event(char*,...)"); // The caller will ensure that event_len is what we have at EVENT_LEN_OFFSET @@ -3027,7 +3024,6 @@ Rotate_log_event::Rotate_log_event(const char* buf, uint event_len, bool Rotate_log_event::write(IO_CACHE* file) { char buf[ROTATE_HEADER_LEN]; - DBUG_ASSERT(!(flags & ZERO_LEN)); // such an event cannot be written int8store(buf + R_POS_OFFSET, pos); return (write_header(file, ROTATE_HEADER_LEN + ident_len) || my_b_safe_write(file, (byte*)buf, ROTATE_HEADER_LEN) || |