database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel

Browse Source 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
serg@sergbook.mysql.com
2007-03-23 16:29:38 +02:00
parent 30c8ec9fdc 25b49e99cd
commit 37e7a07465
3 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/mysqlbinlog.cc
View File

@ -1044,7 +1044,7 @@ static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
uint logname_len;
NET* net;
int error= 0;
my_off_t old_off= start_position_mot;
my_off_t old_off= min(start_position_mot, BIN_LOG_HEADER_SIZE);
char fname[FN_REFLEN+1];
DBUG_ENTER("dump_remote_log_entries");
@ -1196,10 +1196,17 @@ could be out of memory");
}
}
/*
Let's adjust offset for remote log as for local log to produce
similar text.
Let's adjust offset for remote log as for local log to produce
similar text and to have --stop-position to work identically.
Exception - the server sends Format_description_log_event
in the beginning of the dump, and only after it the event from
start_position. Let the old_off reflect it.
*/
old_off+= len-1;
if (old_off < start_position_mot)
old_off= start_position_mot;
else
old_off+= len-1;
}
err: