diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-11-10 22:24:12 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-11-10 22:24:12 -0700 |
commit | 640fadf2f86778d844835ab31f865545b74e131f (patch) | |
tree | 9303005b745dbcfba11b4ee43cd2971c956dc974 /mysys | |
parent | 83aeee648aa923aa1ff1d4eb2e314347fb836d2d (diff) | |
download | mariadb-git-640fadf2f86778d844835ab31f865545b74e131f.tar.gz |
work to enable reading 3.23 logs - not yet finished
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log
client/mysqlbinlog.cc:
work to enable reading 3.23 logs
libmysql/Makefile.shared:
added mf_iocache2 to libmysqlclient - needed for mysqlbinlog
mysql-test/mysql-test-run.sh:
added --start-and-exit
mysql-test/r/rpl000002.result:
result clean-up
mysql-test/r/rpl000016.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/t/rpl000016.test:
test cleanup
mysys/mf_iocache.c:
fixed new bug
sql/log.cc:
write start event only on server start or after reset master
sql/log_event.cc:
work to enable reading 3.23 log format
sql/log_event.h:
work to enable reading 3.23 format
sql/repl_failsafe.cc:
code restructuring
sql/repl_failsafe.h:
re-organized code
sql/slave.cc:
check master version
sql/slave.h:
old_format member
sql/sql_class.h:
allow user to specify io cache type
need_start_event member to allow writing start event only in the first log
sql/sql_parse.cc:
code re-organization
sql/sql_repl.cc:
code reorganization
sql/sql_repl.h:
reorganized code
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/mf_iocache.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index f9b668ce09f..f29df74b651 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -166,7 +166,8 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize, info->seek_not_done= test(file >= 0 && type != READ_FIFO && type != READ_NET); info->myflags=cache_myflags & ~(MY_NABP | MY_FNABP); - info->rc_request_pos=info->rc_pos=info->buffer; + info->rc_request_pos=info->rc_pos= info->write_pos = info->buffer; + info->write_pos = info->write_end = 0; if (type == SEQ_READ_APPEND) { info->append_read_pos = info->write_pos = info->append_buffer; @@ -308,6 +309,11 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type, { info->append_read_pos = info->write_pos = info->append_buffer; } + if (!info->write_pos) + info->write_pos = info->buffer; + if (!info->write_end) + info->write_end = info->buffer+info->buffer_length- + (seek_offset & (IO_SIZE-1)); info->type=type; info->error=0; init_read_function(info,type); |