bk commit into 5.0 tree (marko:1.1946)

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1946 05/09/13 12:35:25 marko@stripped +3 -0
  Improve the comments of os_file_create_tmpfile() and
  innobase_mysql_tmpfile().

  sql/ha_innodb.cc
    1.256 05/09/13 12:35:14 marko@stripped +1 -1
    Improve the documentation of innobase_mysql_tmpfile().

  innobase/os/os0file.c
    1.111 05/09/13 12:35:14 marko@stripped +7 -3
    Improve the documentation of os_file_create_tmpfile().
    Replace S_IREAD | S_IWRITE with 0600 to avoid compilation
    error in InnoDB Hot Backup. (Apparently these constants
    require -D_BSD_SOURCE on GNU/Linux.)

  innobase/include/os0file.h
    1.39 05/09/13 12:35:13 marko@stripped +5 -2
    Improve the documentation of os_file_create_tmpfile().

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-5.0

--- 1.38/innobase/include/os0file.h	2005-07-26 14:21:32 +03:00
+++ 1.39/innobase/include/os0file.h	2005-09-13 12:35:13 +03:00
@@ -182,12 +182,15 @@
 os_io_init_simple(void);
 /*===================*/
 /***************************************************************************
-Creates a temporary file. */
+Creates a temporary file.  This function is like tmpfile(3), but
+the temporary file is created in the MySQL temporary directory.
+On Netware, this function is like tmpfile(3), because the C run-time
+library of Netware does not expose the delete-on-close flag. */
 
 FILE*
 os_file_create_tmpfile(void);
 /*========================*/
-			/* out: temporary file handle (never NULL) */
+			/* out: temporary file handle (or NULL on error) */
 /***************************************************************************
 The os_file_opendir() function opens a directory stream corresponding to the
 directory named by the dirname argument. The directory stream is positioned

--- 1.110/innobase/os/os0file.c	2005-07-26 14:21:32 +03:00
+++ 1.111/innobase/os/os0file.c	2005-09-13 12:35:14 +03:00
@@ -501,7 +501,8 @@
 
 #if !defined(UNIV_HOTBACKUP) && !defined(__NETWARE__)
 /*************************************************************************
-Creates a temporary file. This function is defined in ha_innodb.cc. */
+Creates a temporary file that will be deleted on close.
+This function is defined in ha_innodb.cc. */
 
 int
 innobase_mysql_tmpfile(void);
@@ -510,7 +511,10 @@
 #endif /* !UNIV_HOTBACKUP && !__NETWARE__ */
 
 /***************************************************************************
-Creates a temporary file. */
+Creates a temporary file.  This function is like tmpfile(3), but
+the temporary file is created in the MySQL temporary directory.
+On Netware, this function is like tmpfile(3), because the C run-time
+library of Netware does not expose the delete-on-close flag. */
 
 FILE*
 os_file_create_tmpfile(void)
@@ -535,7 +539,7 @@
 			O_SEQUENTIAL | O_SHORT_LIVED | O_TEMPORARY |
 #  endif /* __WIN__ */
 			O_CREAT | O_EXCL | O_RDWR,
-			S_IREAD | S_IWRITE);
+			0600);
 		if (fd >= 0) {
 #  ifndef __WIN__
 			unlink(name);

--- 1.255/sql/ha_innodb.cc	2005-09-06 14:38:17 +03:00
+++ 1.256/sql/ha_innodb.cc	2005-09-13 12:35:14 +03:00
@@ -695,7 +695,7 @@
 }
 
 /*************************************************************************
-Creates a temporary file. */
+Creates a temporary file that will be deleted on close. */
 extern "C"
 int
 innobase_mysql_tmpfile(void)