mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340 client/mysqlbinlog.cc: Auto merged
This commit is contained in:
commit
f89e03fd78
1 changed files with 10 additions and 7 deletions
|
@ -185,6 +185,8 @@ public:
|
|||
}
|
||||
Create_file_log_event *grab_event(uint file_id)
|
||||
{
|
||||
if (file_id >= file_names.elements)
|
||||
return 0;
|
||||
Create_file_log_event **ptr=
|
||||
(Create_file_log_event**)file_names.buffer + file_id;
|
||||
Create_file_log_event *res= *ptr;
|
||||
|
@ -198,8 +200,14 @@ public:
|
|||
}
|
||||
void process(Append_block_log_event *ae)
|
||||
{
|
||||
if (ae->file_id >= file_names.elements)
|
||||
{
|
||||
Create_file_log_event* ce= 0;
|
||||
|
||||
if (ae->file_id < file_names.elements)
|
||||
ce= *((Create_file_log_event**)file_names.buffer + ae->file_id);
|
||||
|
||||
if (ce)
|
||||
append_to_file(ce->fname,O_APPEND|O_BINARY|O_WRONLY,ae->block,ae->block_len);
|
||||
else
|
||||
/*
|
||||
There is no Create_file event (a bad binlog or a big
|
||||
--position). Assuming it's a big --position, we just do nothing and
|
||||
|
@ -207,11 +215,6 @@ public:
|
|||
*/
|
||||
fprintf(stderr,"Warning: ignoring Append_block as there is no \
|
||||
Create_file event for file_id: %u\n",ae->file_id);
|
||||
return;
|
||||
}
|
||||
Create_file_log_event* ce=
|
||||
*((Create_file_log_event**)file_names.buffer + ae->file_id);
|
||||
append_to_file(ce->fname,O_APPEND|O_BINARY|O_WRONLY,ae->block,ae->block_len);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue