Merge lp:~akopytov/percona-xtrabackup/bug1210266-2.0 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/496/

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Alexey Kopytov (akopytov)]

Should have been a G2 MP.

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-08-10 15:45:25 +0000
+++ src/xtrabackup.cc	2013-08-13 05:43:22 +0000
@@ -5172,29 +5172,31 @@
 static ibool
 xb_create_suspend_file(const char *path)
 {
-	ibool			success;
-	os_file_t		suspend_file = XB_FILE_UNDEFINED;
-	pid_t			pid;
-	char			buffer[64];
+	File	suspend_file;
+	pid_t	pid;
+	char	buffer[64];
 
 	pid = getpid();
-	sprintf(buffer, "%d", pid);
-
-	msg("xtrabackup: Creating suspend file '%s' with pid '%u'\n", path, pid);
-	
-	suspend_file = xb_file_create_no_error_handling(path, OS_FILE_CREATE,
-							OS_FILE_READ_WRITE,
-							&success);
-
-	if (success && suspend_file != XB_FILE_UNDEFINED) {
-		xb_os_file_write(path, suspend_file, buffer, 0, strlen(buffer));
-		os_file_close(suspend_file);
-		return(TRUE);
+	snprintf(buffer, sizeof(buffer), "%u", (uint) pid);
+
+	msg("xtrabackup: Creating suspend file '%s' with pid '%u'\n",
+	    path, (uint) pid);
+
+	suspend_file = my_create(path, 0, O_WRONLY | O_EXCL | O_NOFOLLOW,
+				 MYF(MY_WME));
+
+	if (suspend_file >= 0) {
+		ibool rc;
+
+		rc = my_write(suspend_file, (uchar *) buffer, strlen(buffer),
+			      MYF(MY_WME | MY_NABP)) == 0;
+
+		my_close(suspend_file, MYF(MY_WME));
+		return(rc);
 	}
 
-	msg("xtrabackup: Error: failed to create file '%s' with %d\n", path,
-	    os_file_get_last_error(TRUE));
-
+	msg("xtrabackup: Error: failed to create file '%s'\n",
+	    path);
 	return(FALSE);
 }