diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_iocache2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index ff05b7fa485..b2c05ca8c95 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -100,14 +100,14 @@ my_off_t my_b_append_tell(IO_CACHE* info) */ { volatile my_off_t save_pos; - save_pos = my_tell(info->file,MYF(0)); - my_seek(info->file,(my_off_t)0,MY_SEEK_END,MYF(0)); + save_pos= mysql_file_tell(info->file, MYF(0)); + mysql_file_seek(info->file, 0, MY_SEEK_END, MYF(0)); /* Save the value of my_tell in res so we can see it when studying coredump */ DBUG_ASSERT(info->end_of_file - (info->append_read_pos-info->write_buffer) - == (res=my_tell(info->file,MYF(0)))); - my_seek(info->file,save_pos,MY_SEEK_SET,MYF(0)); + == (res= mysql_file_tell(info->file, MYF(0)))); + mysql_file_seek(info->file, save_pos, MY_SEEK_SET, MYF(0)); } #endif res = info->end_of_file + (info->write_pos-info->append_read_pos); @@ -201,7 +201,7 @@ size_t my_b_fill(IO_CACHE *info) if (info->seek_not_done) { /* File touched, do seek */ - if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) == + if (mysql_file_seek(info->file, pos_in_file, MY_SEEK_SET, MYF(0)) == MY_FILEPOS_ERROR) { info->error= 0; @@ -219,7 +219,7 @@ size_t my_b_fill(IO_CACHE *info) info->error= 0; return 0; /* EOF */ } - if ((length= my_read(info->file,info->buffer,max_length, + if ((length= mysql_file_read(info->file, info->buffer, max_length, info->myflags)) == (size_t) -1) { info->error= -1; @@ -283,7 +283,7 @@ my_off_t my_b_filelength(IO_CACHE *info) return my_b_tell(info); info->seek_not_done= 1; - return my_seek(info->file, 0L, MY_SEEK_END, MYF(0)); + return mysql_file_seek(info->file, 0, MY_SEEK_END, MYF(0)); } |