Merge lp:~sergei.glushchenko/percona-server/5.5-BT34246-ps-blueprint-into-outfile-pipe-and-socket into lp:percona-server/5.5

[Sergei Glushchenko]

This patch allows OUTFILE to write to fifo and unix socket.
fifo/socket should already be created in filesystem.
If file specified as OUTFILE exists server will check it's type.
If file is fifo, my_open will be used instead of my_create.
If file is socket, socket+conect will be used to connect to socket.
Both fifo and socken then will be worked with like an regular file.
If existing file is regular file, error will be thrown as it was before.

[Sergei Glushchenko (sergei.glushchenko)]

Jenkins run is here: http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/822/

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Alexey Kopytov (akopytov)]

Sergeim

   - the patch also allows using FIFOs/sockets with SELECT INTO
     DUMPFILE, rather than just SELECT INTO OUTFILE, but it’s not
     present anywhere in tests/MP/blueprint

   - please copy the MP description into the BP

   - Unix domain sockets are not supported on Windows, so all
     sockets-related code should be wrapped into #ifndef __WIN__

   - the test should also include inc/not_windows.inc

   - call to mysql_file_open() in create_file() does not need O_EXCL (it
     only makes sense together with O_CREAT which is not being passed)

   - if either mysql_file_open() or mysql_unix_socket_connect() return
     -1, create_file() assumes the file was neither a FIFO nor a socket
     and raises the ER_FILE_EXISTS_ERROR. Instead, it should not raise
     any errors (because it was already raised by one of those
     functions) and return -1.

   - if connect() fails in my_unix_socket_connect(), we return without
     closing the socket.

   - instead of doing:

—
  if (connect(sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
    if (MyFlags & (MY_FAE | MY_WME))
      my_error(EE_CONNECT, MYF(0), FileName, errno);
    DBUG_RETURN(-1);
  }

  DBUG_RETURN(my_register_filename((File) sd, FileName, FILE_BY_OPEN,
           EE_FILENOTFOUND, MyFlags));
—

you could do:

—
  if (connect(sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
    close(sd);
    sd= -1;
  }

  DBUG_RETURN(my_register_filename((File) sd, FileName, FILE_BY_OPEN,
           EE_CONNECT, MyFlags));
—

  - in the test case, the following Perl snippet creates a FIFO named
    ‘outfile’, but then the further code expects it to be named
    ‘fifo’:

—
perl;
use POSIX qw(mkfifo);
my $fn = "$ENV{'MYSQL_TMP_DIR'}/outfile";
unlink($fn);
mkfifo($fn, 0666) or die("mkfifo: $!");
EOF

--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--send_eval SELECT 1,2,3 INTO OUTFILE '$MYSQL_TMP_DIR/fifo'

perl;
my $fn = "$ENV{'MYSQL_TMP_DIR'}/fifo";
open(FILE, $fn);
print(<FILE>);
close(FILE);
unlink($fn);
EOF
—

    The above only works because the second Perl snippet opens the file
    for reading and writing (i.e. creates a regular file named ‘fifo’)
    before SELECT INTO OUTFILE opens it. So we are testing SELECT INTO
    OUTFILE with a regular file here. Also, the second snippet is
    equivalent to:

--cat_file $MYSQL_TMP_DIR/fifo

  - the Unix domain socket test uses SLEEP() for synchronization. I
    understand it is tricky to avoid it in this case. But the following
    should work:

    1) create a procedure that would poll a certain file and execute
       SELECT INTO OUTFILE only when it is created:

CREATE PROCEDURE p1() BEGIN WHILE ISNULL(LOAD_FILE('$MYSQL_TMP_DIR/trigger')) DO SELECT SLEEP(1); END WHILE; SELECT 1,2,3 INTO OUTFILE '$MYSQL_TMP_DIR/socket'

    2) In Perl create that file before the listen() call:

open(FILE, '>', "$ENV{'MYSQL_TMP_DIR'}/trigger");
close(FILE);

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Hi Alexey,

> Sergeim
>
> - the patch also allows using FIFOs/sockets with SELECT INTO
> DUMPFILE, rather than just SELECT INTO OUTFILE, but it’s not
> present anywhere in tests/MP/blueprint
>

I've mentioned it in both comments/MP and modified the test case to verify this behaviour. I think it's a feature rather than bug.

> - please copy the MP description into the BP
>
done.

> - Unix domain sockets are not supported on Windows, so all
> sockets-related code should be wrapped into #ifndef __WIN__
>

done.

> - the test should also include inc/not_windows.inc
>

done.

> - call to mysql_file_open() in create_file() does not need O_EXCL (it
> only makes sense together with O_CREAT which is not being passed)
>

right, it doesn't make sense. removed.

> - if either mysql_file_open() or mysql_unix_socket_connect() return
> -1, create_file() assumes the file was neither a FIFO nor a socket
> and raises the ER_FILE_EXISTS_ERROR. Instead, it should not raise
> any errors (because it was already raised by one of those
> functions) and return -1.
>

We need to raise ER_FILE_EXISTS_ERROR, in case when file exists and is not socket/fifo, but you're right that we did it also in the case of other errors. Fixed.

> - if connect() fails in my_unix_socket_connect(), we return without
> closing the socket.
>
> - instead of doing:
>
> —
> if (connect(sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
> if (MyFlags & (MY_FAE | MY_WME))
> my_error(EE_CONNECT, MYF(0), FileName, errno);
> DBUG_RETURN(-1);
> }
>
> DBUG_RETURN(my_register_filename((File) sd, FileName, FILE_BY_OPEN,
> EE_FILENOTFOUND, MyFlags));
> —
>
> you could do:
>
> —
> if (connect(sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
> close(sd);
> sd= -1;
> }
>
> DBUG_RETURN(my_register_filename((File) sd, FileName, FILE_BY_OPEN,
> EE_CONNECT, MyFlags));
> —
>

Done.

> - in the test case, the following Perl snippet creates a FIFO named
> ‘outfile’, but then the further code expects it to be named
> ‘fifo’:
>
> —
> perl;
> use POSIX qw(mkfifo);
> my $fn = "$ENV{'MYSQL_TMP_DIR'}/outfile";
> unlink($fn);
> mkfifo($fn, 0666) or die("mkfifo: $!");
> EOF
>
> --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
> --send_eval SELECT 1,2,3 INTO OUTFILE '$MYSQL_TMP_DIR/fifo'
>
> perl;
> my $fn = "$ENV{'MYSQL_TMP_DIR'}/fifo";
> open(FILE, $fn);
> print(<FILE>);
> close(FILE);
> unlink($fn);
> EOF
> —
>
> The above only works because the second Perl snippet opens the file
> for reading and writing (i.e. creates a regular file named ‘fifo’)
> before SELECT INTO OUTFILE opens it. So we are testing SELECT INTO
> OUTFILE with a regular file here.

Fixed.

> Also, the second snippet is
> equivalent to:
>
> --cat_file $MYSQL_TMP_DIR/fifo
>

Replaced perl with cat_file.

> - the Unix domain socket test uses SLEEP() for synchronization. I
> understand it is tricky to avoid it in this case. But the following
> should work:
>
> 1) create a procedure that would poll a certain file and execute
> SELECT INTO OUTFILE only when i...

[Sergei Glushchenko (sergei.glushchenko)]

new build
http://jenkins.percona.com/job/percona-server-5.5-param/861/

[Alexey Kopytov (akopytov)]

MY_S_IFSOCK and MY_S_ISSOCK should also be inside #ifndef __WIN__ (Windows simply doesn't define S_IFSOCK). No need for another jenkins build.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

It somehow didn't occur to me late in the evening that the constant will not be used anywhere. So please ignore the last comment.

review: Approve

=== modified file 'Percona-Server/include/my_dir.h'
--- Percona-Server/include/my_dir.h	2013-03-19 12:36:34 +0000
+++ Percona-Server/include/my_dir.h	2013-09-19 16:14:11 +0000
@@ -32,6 +32,7 @@
 #define MY_S_IFBLK	S_IFBLK /* block special */
 #define MY_S_IFREG	S_IFREG /* regular */
 #define MY_S_IFIFO	S_IFIFO /* fifo */
+#define MY_S_IFSOCK	S_IFSOCK /* socket */
 #define MY_S_ISUID	S_ISUID /* set user id on execution */
 #define MY_S_ISGID	S_ISGID /* set group id on execution */
 #define MY_S_ISVTX	S_ISVTX /* save swapped text even after use */
@@ -44,6 +45,7 @@
 #define MY_S_ISBLK(m)	(((m) & MY_S_IFMT) == MY_S_IFBLK)
 #define MY_S_ISREG(m)	(((m) & MY_S_IFMT) == MY_S_IFREG)
 #define MY_S_ISFIFO(m)	(((m) & MY_S_IFMT) == MY_S_IFIFO)
+#define MY_S_ISSOCK(m)	(((m) & MY_S_IFMT) == MY_S_IFSOCK)
 
 #define MY_DONT_SORT	512	/* my_lib; Don't sort files */
 #define MY_WANT_STAT	1024	/* my_lib; stat files */

=== modified file 'Percona-Server/include/my_sys.h'
--- Percona-Server/include/my_sys.h	2013-06-27 15:35:20 +0000
+++ Percona-Server/include/my_sys.h	2013-09-19 16:14:11 +0000
@@ -562,6 +562,9 @@
 extern char *my_once_strdup(const char *src,myf myflags);
 extern void *my_once_memdup(const void *src, size_t len, myf myflags);
 extern File my_open(const char *FileName,int Flags,myf MyFlags);
+#ifndef __WIN__
+extern File my_unix_socket_connect(const char *FileName,myf MyFlags);
+#endif
 extern File my_register_filename(File fd, const char *FileName,
 				 enum file_type type_of_file,
 				 uint error_message_number, myf MyFlags);

=== modified file 'Percona-Server/include/mysql/psi/mysql_file.h'
--- Percona-Server/include/mysql/psi/mysql_file.h	2010-12-21 12:00:26 +0000
+++ Percona-Server/include/mysql/psi/mysql_file.h	2013-09-19 16:14:11 +0000
@@ -303,6 +303,21 @@
 #endif
 
 /**
+  @def mysql_unix_socket_connect(K, N, F)
+  Instrumented open.
+  @c mysql_unix_socket_connect connects to the unix domain socket.
+*/
+#ifndef __WIN__
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_unix_socket_connect(K, N, F) \
+    inline_mysql_unix_socket_connect(K, __FILE__, __LINE__, N, F)
+#else
+  #define mysql_unix_socket_connect(K, N, F) \
+    inline_mysql_unix_socket_connect(N, F)
+#endif
+#endif
+
+/**
   @def mysql_file_close(FD, F)
   Instrumented close.
   @c mysql_file_close is a replacement for @c my_close.
@@ -1051,6 +1066,35 @@
   return file;
 }
 
+#ifndef __WIN__
+static inline File
+inline_mysql_unix_socket_connect(
+#ifdef HAVE_PSI_INTERFACE
+  PSI_file_key key, const char *src_file, uint src_line,
+#endif
+  const char *filename, myf myFlags)
+{
+  File file;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_file_locker *locker= NULL;
+  PSI_file_locker_state state;
+  if (likely(PSI_server != NULL))
+  {
+    locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_OPEN,
+                                                    filename, &locker);
+    if (likely(locker != NULL))
+      PSI_server->start_file_open_wait(locker, src_file, src_line);
+  }
+#endif
+  file = my_unix_socket_connect(filename, myFlags);
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_file_open_wait_and_bind_to_descriptor(locker, file);
+#endif
+  return file;
+}
+#endif
+
 static inline int
 inline_mysql_file_close(
 #ifdef HAVE_PSI_INTERFACE

=== modified file 'Percona-Server/include/mysys_err.h'
--- Percona-Server/include/mysys_err.h	2011-06-30 15:46:53 +0000
+++ Percona-Server/include/mysys_err.h	2013-09-19 16:14:11 +0000
@@ -66,7 +66,10 @@
 #define EE_CHANGE_OWNERSHIP     31
 #define EE_CHANGE_PERMISSIONS   32
 #define EE_CANT_SEEK            33
-#define EE_ERROR_LAST           33 /* Copy last error nr */
+#define EE_SOCKET               34
+#define EE_CONNECT              35
+#define EE_TOOLONGFILENAME      36
+#define EE_ERROR_LAST           36 /* Copy last error nr */
 /* Add error numbers before EE_ERROR_LAST and change it accordingly. */
 
   /* exit codes for all MySQL programs */

=== added file 'Percona-Server/mysql-test/include/outfile_fifosocket.inc'
--- Percona-Server/mysql-test/include/outfile_fifosocket.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/outfile_fifosocket.inc	2013-09-19 16:14:11 +0000
@@ -0,0 +1,68 @@
+#
+# Test SELECT INTO OUTFILE/DUMPFILE with fifo and unix socket as destination
+#
+
+perl;
+my $fn = "$ENV{'MYSQL_TMP_DIR'}/regular";
+unlink($fn);
+open(FILE, ">$fn");
+print(FILE "1\n");
+close(FILE);
+EOF
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--error 1086
+--eval SELECT 1,2,3 INTO $select_into '$MYSQL_TMP_DIR/regular'
+
+perl;
+use POSIX qw(mkfifo);
+my $fn = "$ENV{'MYSQL_TMP_DIR'}/fifo";
+unlink($fn);
+mkfifo($fn, 0666) or die("mkfifo: $!");
+EOF
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--send_eval SELECT 1,2,3 INTO $select_into '$MYSQL_TMP_DIR/fifo'
+
+--cat_file $MYSQL_TMP_DIR/fifo
+
+--reap
+
+DELIMITER //;
+# procedure spin waiting when file 'trigger' appears
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--eval CREATE PROCEDURE p1() BEGIN WHILE ISNULL(LOAD_FILE('$MYSQL_TMP_DIR/trigger')) DO SELECT SLEEP(1); END WHILE; SELECT 1,2,3 INTO $select_into '$MYSQL_TMP_DIR/socket'; END
+DELIMITER ;//
+
+--send CALL p1()
+
+perl;
+use Socket;
+use IO::Handle;
+
+my $fn = "$ENV{'MYSQL_TMP_DIR'}/socket";
+my $trigger = "$ENV{'MYSQL_TMP_DIR'}/trigger";
+
+unlink($fn);
+socket(SERV, PF_UNIX, SOCK_STREAM, 0) or die("socket: $!");
+bind(SERV, sockaddr_un($fn)) or die("bind $fn: $!");
+
+# tell the p1 that we created the socket
+open(FILE, ">$trigger");
+close(FILE);
+
+listen(SERV, 1) or die("listen: $!");
+
+accept(CLIENT, SERV);
+$content = <CLIENT>;
+close(CLIENT);
+close(SERV);
+unlink($fn);
+unlink($trigger);
+
+EOF
+
+--disable_result_log
+--reap
+
+DROP PROCEDURE p1;

=== added file 'Percona-Server/mysql-test/r/percona_outfile_fifosocket.result'
--- Percona-Server/mysql-test/r/percona_outfile_fifosocket.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_outfile_fifosocket.result	2013-09-19 16:14:11 +0000
@@ -0,0 +1,12 @@
+SELECT 1,2,3 INTO OUTFILE 'MYSQL_TMP_DIR/regular';
+ERROR HY000: File 'MYSQL_TMP_DIR/regular' already exists
+SELECT 1,2,3 INTO OUTFILE 'MYSQL_TMP_DIR/fifo';
+1	2	3
+CREATE PROCEDURE p1() BEGIN WHILE ISNULL(LOAD_FILE('MYSQL_TMP_DIR/trigger')) DO SELECT SLEEP(1); END WHILE; SELECT 1,2,3 INTO OUTFILE 'MYSQL_TMP_DIR/socket'; END//
+CALL p1();
+DROP PROCEDURE p1;
+SELECT 1,2,3 INTO DUMPFILE 'MYSQL_TMP_DIR/regular';
+SELECT 1,2,3 INTO DUMPFILE 'MYSQL_TMP_DIR/fifo';
+123CREATE PROCEDURE p1() BEGIN WHILE ISNULL(LOAD_FILE('MYSQL_TMP_DIR/trigger')) DO SELECT SLEEP(1); END WHILE; SELECT 1,2,3 INTO DUMPFILE 'MYSQL_TMP_DIR/socket'; END//
+CALL p1();
+DROP PROCEDURE p1;

=== added file 'Percona-Server/mysql-test/t/percona_outfile_fifosocket-master.opt'
--- Percona-Server/mysql-test/t/percona_outfile_fifosocket-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_outfile_fifosocket-master.opt	2013-09-19 16:14:11 +0000
@@ -0,0 +1,1 @@
+--secure_file_priv=$MYSQL_TMP_DIR

=== added file 'Percona-Server/mysql-test/t/percona_outfile_fifosocket.test'
--- Percona-Server/mysql-test/t/percona_outfile_fifosocket.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_outfile_fifosocket.test	2013-09-19 16:14:11 +0000
@@ -0,0 +1,12 @@
+#
+# Test that it is possible to specify fifos and unix sockets as
+# an outfile
+#
+
+--source include/not_windows.inc
+
+--let $select_into=OUTFILE
+--source include/outfile_fifosocket.inc
+
+--let $select_into=DUMPFILE
+--source include/outfile_fifosocket.inc

=== modified file 'Percona-Server/mysys/errors.c'
--- Percona-Server/mysys/errors.c	2013-03-01 09:31:32 +0000
+++ Percona-Server/mysys/errors.c	2013-09-19 16:14:11 +0000
@@ -52,7 +52,10 @@
   "File '%s' (fileno: %d) was not closed",
   "Can't change ownership of the file '%s' (Errcode: %d)",
   "Can't change permissions of the file '%s' (Errcode: %d)",
-  "Can't seek in file '%s' (Errcode: %d)"
+  "Can't seek in file '%s' (Errcode: %d)",
+  "Can't create socket '%s' (Errcode: %d)",
+  "Can't connect to '%s' (Errcode: %d)",
+  "File name '%s' is too long (max: %d)"
 };
 
 void init_glob_errs(void)
@@ -96,6 +99,9 @@
   EE(EE_CHANGE_OWNERSHIP)   = "Can't change ownership of the file '%s' (Errcode: %d)";
   EE(EE_CHANGE_PERMISSIONS) = "Can't change permissions of the file '%s' (Errcode: %d)";
   EE(EE_CANT_SEEK)      = "Can't seek in file '%s' (Errcode: %d)";
+  EE(EE_SOCKET) = "Can't create socket '%s' (Errcode: %d)";
+  EE(EE_CONNECT) = "Can't connect to '%s' (Errcode: %d)";
+  EE(EE_TOOLONGFILENAME) = "File name '%s' is too long (max: %d)";
 }
 #endif
 

=== modified file 'Percona-Server/mysys/my_open.c'
--- Percona-Server/mysys/my_open.c	2013-03-19 12:36:34 +0000
+++ Percona-Server/mysys/my_open.c	2013-09-19 16:14:11 +0000
@@ -17,6 +17,9 @@
 #include "mysys_err.h"
 #include <my_dir.h>
 #include <errno.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
 
 
 /*
@@ -55,6 +58,56 @@
 
 
 /*
+  Connect to unix domain socket
+
+  SYNOPSIS
+    my_unix_socket_connect()
+      FileName  Fully qualified file name
+      MyFlags Special flags
+
+  RETURN VALUE
+    File descriptor
+*/
+
+#ifndef __WIN__
+File my_unix_socket_connect(const char *FileName, myf MyFlags)
+        /* Path-name of file */
+        /* Read | write .. */
+        /* Special flags */
+{
+  my_socket sd;
+  struct sockaddr_un addr;
+  DBUG_ENTER("my_unix_socket_connect");
+  DBUG_PRINT("my",("Name: '%s'  MyFlags: %d",
+       FileName, MyFlags));
+
+  if (strlen(FileName) > (sizeof(addr.sun_path) - 1))
+  {
+    if (MyFlags & (MY_FAE | MY_WME))
+      my_error(EE_TOOLONGFILENAME, MYF(0), FileName, sizeof(addr.sun_path) - 1);
+    DBUG_RETURN(-1);
+  }
+  if ((sd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+  {
+    if (MyFlags & (MY_FAE | MY_WME))
+      my_error(EE_SOCKET, MYF(0), FileName, errno);
+    DBUG_RETURN(-1);
+  }
+  memset(&addr, 0, sizeof(addr));
+  addr.sun_family = AF_UNIX;
+  strcpy(addr.sun_path, FileName);
+  if (connect(sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
+    close(sd);
+    sd= -1;
+  }
+
+  DBUG_RETURN(my_register_filename((File) sd, FileName, FILE_BY_OPEN,
+           EE_FILENOTFOUND, MyFlags));
+} /* my_unix_socket_connect */
+#endif
+
+
+/*
   Close a file
 
   SYNOPSIS

=== modified file 'Percona-Server/sql/sql_class.cc'
--- Percona-Server/sql/sql_class.cc	2013-08-02 09:40:55 +0000
+++ Percona-Server/sql/sql_class.cc	2013-09-19 16:14:11 +0000
@@ -2490,7 +2490,10 @@
 static File create_file(THD *thd, char *path, sql_exchange *exchange,
 			IO_CACHE *cache)
 {
-  File file;
+  File file= -1;
+  bool new_file_created= false;
+  MY_STAT stat_arg;
+
   uint option= MY_UNPACK_FILENAME | MY_RELATIVE_PATH;
 
 #ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS
@@ -2513,25 +2516,43 @@
     return -1;
   }
 
-  if (!access(path, F_OK))
+  if (my_stat(path, &stat_arg, MYF(0)))
   {
-    my_error(ER_FILE_EXISTS_ERROR, MYF(0), exchange->file_name);
-    return -1;
+    /* Check if file is named pipe or unix socket */
+    if (MY_S_ISFIFO(stat_arg.st_mode))
+      file= mysql_file_open(key_select_to_file,
+                            path, O_WRONLY, MYF(MY_WME));
+#ifndef __WIN__
+    if (MY_S_ISSOCK(stat_arg.st_mode))
+      file= mysql_unix_socket_connect(key_select_to_file,
+                                      path, MYF(MY_WME));
+#endif
+    if (file < 0)
+    {
+      if (!(MY_S_ISFIFO(stat_arg.st_mode) || MY_S_ISSOCK(stat_arg.st_mode)))
+        my_error(ER_FILE_EXISTS_ERROR, MYF(0), exchange->file_name);
+      return -1;
+    }
   }
-  /* Create the file world readable */
-  if ((file= mysql_file_create(key_select_to_file,
-                               path, 0666, O_WRONLY|O_EXCL, MYF(MY_WME))) < 0)
-    return file;
+  else
+  {
+    /* Create the file world readable */
+    if ((file= mysql_file_create(key_select_to_file,
+                                 path, 0666, O_WRONLY|O_EXCL, MYF(MY_WME))) < 0)
+      return file;
+    new_file_created= true;
 #ifdef HAVE_FCHMOD
-  (void) fchmod(file, 0666);			// Because of umask()
+    (void) fchmod(file, 0666);      // Because of umask()
 #else
-  (void) chmod(path, 0666);
+    (void) chmod(path, 0666);
 #endif
+  }
   if (init_io_cache(cache, file, 0L, WRITE_CACHE, 0L, 1, MYF(MY_WME)))
   {
     mysql_file_close(file, MYF(0));
-    /* Delete file on error, it was just created */
-    mysql_file_delete(key_select_to_file, path, MYF(0));
+    /* Delete file on error, if it was just created */
+    if (new_file_created)
+      mysql_file_delete(key_select_to_file, path, MYF(0));
     return -1;
   }
   return file;