diff options
| author | sasha@mysql.sashanet.com <> | 2001-06-26 17:02:33 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-06-26 17:02:33 -0600 |
| commit | 51e3c5de88995d3d942c3c05445aa82d38a4f92e (patch) | |
| tree | 68843be68cdb392645cde55e6ce4669ce7b98c67 /sql/sql_repl.cc | |
| parent | 85388703c400d4a952085a8ed547494bd20863a2 (diff) | |
| download | mariadb-git-51e3c5de88995d3d942c3c05445aa82d38a4f92e.tar.gz | |
--do-test option in mysql-test-run - will do only tests that match the pattern
updated rotate event to set new position along with the new log
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 435319fe6e0..0c835ee4e57 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -62,7 +62,7 @@ void end_slave_list() static int fake_rotate_event(NET* net, String* packet, char* log_file_name, const char**errmsg) { - char header[LOG_EVENT_HEADER_LEN]; + char header[LOG_EVENT_HEADER_LEN], buf[ROTATE_HEADER_LEN]; memset(header, 0, 4); // when does not matter header[EVENT_TYPE_OFFSET] = ROTATE_EVENT; char* p = strrchr(log_file_name, FN_LIBCHAR); @@ -73,12 +73,14 @@ static int fake_rotate_event(NET* net, String* packet, char* log_file_name, p = log_file_name; uint ident_len = (uint) strlen(p); - ulong event_len = ident_len + sizeof(header); + ulong event_len = ident_len + ROTATE_EVENT_OVERHEAD; int4store(header + SERVER_ID_OFFSET, server_id); int4store(header + EVENT_LEN_OFFSET, event_len); int2store(header + FLAGS_OFFSET, 0); int4store(header + LOG_SEQ_OFFSET, 0); packet->append(header, sizeof(header)); + int8store(buf, 4); // tell slave to skip magic number + packet->append(buf, ROTATE_HEADER_LEN); packet->append(p,ident_len); if(my_net_write(net, (char*)packet->ptr(), packet->length())) { |