diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-05-05 15:54:28 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-05-05 15:54:28 +0300 |
| commit | 48260e9d92111b40d95854e15233205a87d95da6 (patch) | |
| tree | d39c68b7ae22c2cf5072e992e03afcf12836d64b /innobase | |
| parent | 7d918f213e64df4af4b00d0798fadf9ed1a872fb (diff) | |
| download | mariadb-git-48260e9d92111b40d95854e15233205a87d95da6.tar.gz | |
InnoDB portability fix: new function os_file_set_eof()
innobase/include/os0file.h:
Add os_file_set_eof()
innobase/os/os0file.c:
Add os_file_set_eof()
innobase/srv/srv0srv.c:
Replace chsize() or ftruncate() with os_file_set_eof()
sql/ha_innodb.cc:
Replace my_chsize() with os_file_set_eof()
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/os0file.h | 8 | ||||
| -rw-r--r-- | innobase/os/os0file.c | 17 | ||||
| -rw-r--r-- | innobase/srv/srv0srv.c | 6 |
3 files changed, 26 insertions, 5 deletions
diff --git a/innobase/include/os0file.h b/innobase/include/os0file.h index 108cf5520f1..de17e2302ae 100644 --- a/innobase/include/os0file.h +++ b/innobase/include/os0file.h @@ -227,6 +227,14 @@ os_file_set_size( size */ ulint size_high);/* in: most significant 32 bits of size */ /*************************************************************************** +Truncates a file at its current position. */ + +ibool +os_file_set_eof( +/*============*/ + /* out: TRUE if success */ + FILE* file); /* in: file to be truncated */ +/*************************************************************************** Flushes the write buffers of a given file to the disk. */ ibool diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 904ddf13c8f..833703e38dd 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -1032,6 +1032,23 @@ error_handling: } /*************************************************************************** +Truncates a file at its current position. */ + +ibool +os_file_set_eof( +/*============*/ + /* out: TRUE if success */ + FILE* file) /* in: file to be truncated */ +{ +#ifdef __WIN__ + HANDLE h = (HANDLE) _get_osfhandle(fileno(file)); + return(SetEndOfFile(h)); +#else /* __WIN__ */ + return(!ftruncate(fileno(file), ftell(file))); +#endif /* __WIN__ */ +} + +/*************************************************************************** Flushes the write buffers of a given file to the disk. */ ibool diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 76197fd8fe0..ba1f72d0a58 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1609,11 +1609,7 @@ loop: mutex_enter(&srv_monitor_file_mutex); rewind(srv_monitor_file); srv_printf_innodb_monitor(srv_monitor_file); -#ifdef __WIN__ - chsize(fileno(srv_monitor_file), ftell(srv_monitor_file)); -#else /* __WIN__ */ - ftruncate(fileno(srv_monitor_file), ftell(srv_monitor_file)); -#endif /* __WIN__ */ + os_file_set_eof(srv_monitor_file); mutex_exit(&srv_monitor_file_mutex); if (srv_print_innodb_tablespace_monitor |