summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/slave.cc6
-rw-r--r--sql/sql_binlog.cc3
2 files changed, 6 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index d1d9abd4027..a63fc9c005d 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -6768,10 +6768,10 @@ bool Relay_log_info::flush()
pos=strmov(pos, group_master_log_name);
*pos++='\n';
pos=longlong10_to_str(group_master_log_pos, pos, 10);
- *pos='\n';
+ *pos++='\n';
pos= longlong10_to_str(sql_delay, pos, 10);
- *pos= '\n';
- if (my_b_write(file, (uchar*) buff, (size_t) (pos-buff)+1))
+ *pos++= '\n';
+ if (my_b_write(file, (uchar*) buff, (size_t) (pos-buff)))
error=1;
if (flush_io_cache(file))
error=1;
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index a7beb42c315..0543cd2434e 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -73,6 +73,9 @@ static int check_event_type(int type, Relay_log_info *rli)
return 0;
case TABLE_MAP_EVENT:
+ case WRITE_ROWS_EVENT_V1:
+ case UPDATE_ROWS_EVENT_V1:
+ case DELETE_ROWS_EVENT_V1:
case WRITE_ROWS_EVENT:
case UPDATE_ROWS_EVENT:
case DELETE_ROWS_EVENT: