diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-04-02 19:52:58 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-04-02 19:52:58 +0300 |
| commit | 6a5c6b171fa6989052c2151475450856be125fc3 (patch) | |
| tree | 4572cadb3ecd5c4b37c0f5e2d2d3b8a228640e5a /mysys | |
| parent | 556071359069d2fca415b3278a0b6717a056f82b (diff) | |
| parent | 3c64d250330ca3916778ec0fc8973356e119e026 (diff) | |
| download | mariadb-git-6a5c6b171fa6989052c2151475450856be125fc3.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_iocache.c | 2 | ||||
| -rw-r--r-- | mysys/mf_iocache2.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 872757f77c5..a0247003a81 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -906,7 +906,7 @@ int _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("_flush_io_cache"); if (!(append_cache = (info->type == SEQ_READ_APPEND))) need_append_buffer_lock=0; diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 127bf20e8fe..c56022e93e8 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -117,6 +117,7 @@ void my_b_seek(IO_CACHE *info,my_off_t pos) } info->pos_in_file=pos; info->seek_not_done=1; + DBUG_VOID_RETURN; } |