Merge with 4.0 to get security patch for check_grant_colum

1 files changed, 17 insertions, 0 deletions

diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index ff5b30bec0d..3f14a2158ed 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -1583,6 +1583,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