Merge lp:~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug1093385 into lp:percona-xtrabackup/2.2

[Sergei Glushchenko]

Manual merge
http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/105/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/src/ds_tmpfile.c'
--- storage/innobase/xtrabackup/src/ds_tmpfile.c	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/src/ds_tmpfile.c	2014-02-25 17:10:41 +0000
@@ -179,6 +179,7 @@
 	void			*buf = NULL;
 	const size_t		 buf_size = 1024 * 1024;
 	size_t			 bytes;
+	size_t			 offset;
 
 	pipe_ctxt = ctxt->pipe_ctxt;
 	xb_a(pipe_ctxt != NULL);
@@ -217,9 +218,11 @@
 			    tmp_file->file->path, my_errno);
 			exit(EXIT_FAILURE);
 		}
+		offset = 0;
 		while ((bytes = my_read(tmp_file->fd, buf, buf_size,
 					MYF(MY_WME))) > 0) {
-			posix_fadvise(tmp_file->fd, 0, 0, POSIX_FADV_DONTNEED);
+			posix_fadvise(tmp_file->fd, offset, buf_size, POSIX_FADV_DONTNEED);
+			offset += buf_size;
 			if (ds_write(dst_file, buf, bytes)) {
 				msg("error: cannot write to stream for '%s'.\n",
 				    tmp_file->orig_path);
 
=== modified file 'storage/innobase/xtrabackup/src/fil_cur.cc'
--- storage/innobase/xtrabackup/src/fil_cur.cc	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/src/fil_cur.cc	2014-02-25 17:10:41 +0000
@@ -357,7 +357,7 @@
 		cursor->buf_npages++;
 	}
 
-	posix_fadvise(cursor->file, 0, 0, POSIX_FADV_DONTNEED);
+	posix_fadvise(cursor->file, offset, to_read, POSIX_FADV_DONTNEED);
 
 	return(ret);
 }
 
=== modified file 'storage/innobase/xtrabackup/src/xbstream.c'
--- storage/innobase/xtrabackup/src/xbstream.c	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/src/xbstream.c	2014-02-25 17:10:41 +0000
@@ -209,8 +209,10 @@
 {
 	uchar	buf[XBSTREAM_BUFFER_SIZE];
 	size_t	bytes;
+	size_t	offset;
 
 	posix_fadvise(file, 0, 0, POSIX_FADV_SEQUENTIAL);
+	offset = my_tell(file, MYF(MY_WME));
 
 	while ((bytes = my_read(file, buf, XBSTREAM_BUFFER_SIZE,
 				MYF(MY_WME))) > 0) {
@@ -219,7 +221,9 @@
 			    my_progname);
 			return 1;
 		}
-		posix_fadvise(file, 0, 0, POSIX_FADV_DONTNEED);
+		posix_fadvise(file, offset, XBSTREAM_BUFFER_SIZE,
+			      POSIX_FADV_DONTNEED);
+		offset += XBSTREAM_BUFFER_SIZE;
 
 	}
 
 
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-01-17 12:20:16 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-02-25 17:10:41 +0000
@@ -4347,6 +4347,8 @@
 	byte*		incremental_buffer_base = NULL;
 	byte*		incremental_buffer;
 
+	size_t		offset;
+
 	ut_a(xtrabackup_incremental);
 
 	if (dbname) {
@@ -4399,7 +4401,6 @@
 	}
 
 	posix_fadvise(src_file, 0, 0, POSIX_FADV_SEQUENTIAL);
-	posix_fadvise(src_file, 0, 0, POSIX_FADV_DONTNEED);
 
 	os_file_set_nocache(src_file, src_path, "OPEN");
 
@@ -4430,11 +4431,10 @@
 
 		/* read to buffer */
 		/* first block of block cluster */
+		offset = ((incremental_buffers * (page_size / 4))
+			 << page_size_shift);
 		success = os_file_read(src_file, incremental_buffer,
-				       ((incremental_buffers
-					 * (page_size / 4))
-					<< page_size_shift),
-				       page_size);
+					  offset, page_size);
 		if (!success) {
 			goto error;
 		}
@@ -4463,14 +4463,14 @@
 
 		/* read whole of the cluster */
 		success = os_file_read(src_file, incremental_buffer,
-				       ((incremental_buffers
-					 * (page_size / 4))
-					<< page_size_shift),
-				       page_in_buffer * page_size);
+					  offset, page_in_buffer * page_size);
 		if (!success) {
 			goto error;
 		}
 
+		posix_fadvise(src_file, offset, page_in_buffer * page_size,
+			      POSIX_FADV_DONTNEED);
+
 		for (page_in_buffer = 1; page_in_buffer < page_size / 4;
 		     page_in_buffer++) {
 			ulint offset_on_page;