mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl

Browse source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


BitKeeper/deleted/.del-show_binlog_events2.inc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
This commit is contained in:
unknown 2008-01-30 16:14:14 +01:00
commit b395490480
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/slave.cc
View file

@ -2846,7 +2846,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
}
if (unlikely(cev_not_written))
{
cev->block = (char*)net->read_pos;
cev->block = net->read_pos;
cev->block_len = num_bytes;
if (unlikely(mi->rli.relay_log.append(cev)))
{
@ -2860,7 +2860,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
}
else
{
aev.block = (char*)net->read_pos;
aev.block = net->read_pos;
aev.block_len = num_bytes;
aev.log_pos = cev->log_pos;
if (unlikely(mi->rli.relay_log.append(&aev)))