diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
| commit | f9e5195b40b4b6678b71fdac2b99442664037d36 (patch) | |
| tree | 8da99e7722c1f587c93a65fdc2a465992ec68b82 /mysys/mf_iocache2.c | |
| parent | 55fc3fb08830cfe8e55b45f5f0e1acf55d00cb4b (diff) | |
| parent | bac287c315b1792e7ae33f91add6a60292f9bae8 (diff) | |
| download | mariadb-git-f9e5195b40b4b6678b71fdac2b99442664037d36.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'mysys/mf_iocache2.c')
| -rw-r--r-- | mysys/mf_iocache2.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index c9bec6f1f5d..a9a237696d2 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. + Copyright (c) 2009, 2018, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -102,14 +103,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,(my_off_t)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); @@ -203,7 +204,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; @@ -223,7 +224,7 @@ size_t my_b_fill(IO_CACHE *info) } DBUG_EXECUTE_IF ("simulate_my_b_fill_error", {DBUG_SET("+d,simulate_file_read_error");}); - 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; @@ -287,7 +288,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, 0L, MY_SEEK_END, MYF(0)); } |