diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-11-08 22:27:55 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-11-08 22:27:55 -0700 |
commit | 1c809563c2ba3576e4584eda06125bf8a15850ee (patch) | |
tree | becb201de4801df50deca53f574595aa10ed70b3 /mysys/mf_iocache2.c | |
parent | 91fb1d23770503d29744fc0c973065decd1bf0a1 (diff) | |
download | mariadb-git-1c809563c2ba3576e4584eda06125bf8a15850ee.tar.gz |
fixed memory leak in replication
fixed bugs in new IO_CACHE code so that the old calls work
fixed shutdown bug
clean-up of mysql-test-run
include/my_sys.h:
fixes for IO_CACHE
mysql-test/mysql-test-run.sh:
fixed missing \ bug
added --skip-gdb-magic to skip Sergei's automatic mysql_parse break
do not delete the breakpoint in command - it crashes gdb sometimes
mysys/mf_iocache2.c:
rc_pos->write_pos in my_b_seek for WRITE_CACHE
sql/mysqld.cc:
fixed shutdown bug when singals DO break read introduced by the fix for
when they don't.
sql/repl_failsafe.cc:
fixed memory leak
Diffstat (limited to 'mysys/mf_iocache2.c')
-rw-r--r-- | mysys/mf_iocache2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 76b8055bb45..4e8f3e19ad9 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -38,10 +38,10 @@ void my_b_seek(IO_CACHE *info,my_off_t pos) } else if (info->type == WRITE_CACHE) { - byte* try_rc_pos; - try_rc_pos = info->rc_pos + (pos - info->pos_in_file); - if (try_rc_pos >= info->buffer && try_rc_pos <= info->rc_end) - info->rc_pos = try_rc_pos; + byte* try_write_pos; + try_write_pos = info->write_pos + (pos - info->pos_in_file); + if (try_write_pos >= info->buffer && try_write_pos <= info->write_end) + info->write_pos = try_write_pos; else flush_io_cache(info); } |