diff options
author | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
commit | 350b4335696fc88efa2bbf2139d2f8bf9aa5701c (patch) | |
tree | af285d8080c003d1ecb1479ec43c9b6996fd567f /mysys/mf_iocache.c | |
parent | 861bf3c8c031ea80076acb7f7466bda73b23213c (diff) | |
parent | 325f6615254c871d71d9d71bb5910a61d9a61ea2 (diff) | |
download | mariadb-git-350b4335696fc88efa2bbf2139d2f8bf9aa5701c.tar.gz |
merge with 4.0
Diffstat (limited to 'mysys/mf_iocache.c')
-rw-r--r-- | mysys/mf_iocache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index f64dc5abf2d..d2c373ab0c6 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -987,7 +987,7 @@ int my_b_append(register IO_CACHE *info, const byte *Buffer, uint Count) Buffer+=rest_length; Count-=rest_length; info->write_pos+=rest_length; - if (_flush_io_cache(info,0)) + if (my_b_flush_io_cache(info,0)) { unlock_append_buffer(info); return 1; @@ -1094,12 +1094,12 @@ int my_block_write(register IO_CACHE *info, const byte *Buffer, uint Count, #endif -int _flush_io_cache(IO_CACHE *info, int need_append_buffer_lock) +int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock) { uint length; my_bool append_cache; my_off_t pos_in_file; - DBUG_ENTER("_flush_io_cache"); + DBUG_ENTER("my_b_flush_io_cache"); if (!(append_cache = (info->type == SEQ_READ_APPEND))) need_append_buffer_lock=0; |