Merge lp:~gl-az/percona-xtrabackup/2.1-bug1190610 into lp:percona-xtrabackup/2.1

[George Ormond Lorch III]

Fix for bug 1190610 : Decryption fails at a later stage.

xbcrypt_read_chunk was relying on blocking/full I/O even though it didn't
specify MY_FULL_IO during the bulk data read. Added ability to pass
desired flags down through read mechanism callback so that header reads
can fail on EOF and bulk data can block until data is available.

[George Ormond Lorch III (gl-az)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/340/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'src/xbcrypt.c'
--- src/xbcrypt.c	2013-03-11 19:11:29 +0000
+++ src/xbcrypt.c	2013-06-18 23:25:32 +0000
@@ -280,10 +280,10 @@
 
 static
 ssize_t
-my_xb_crypt_read_callback(void *userdata, void *buf, size_t len)
+my_xb_crypt_read_callback(void *userdata, void *buf, size_t len, int flags)
 {
 	File* file = (File *) userdata;
-	return my_read(*file, buf, len, MYF(MY_WME));
+	return my_read(*file, buf, len, flags);
 }
 
 static

=== modified file 'src/xbcrypt.h'
--- src/xbcrypt.h	2013-03-11 19:11:29 +0000
+++ src/xbcrypt.h	2013-06-18 23:25:32 +0000
@@ -53,7 +53,7 @@
 
 /* Callback on write for i/o, must return # of bytes read or -1 on error */
 typedef ssize_t xb_crypt_read_callback(void *userdata,
-				       void *buf, size_t len);
+				       void *buf, size_t len, int flags);
 
 xb_rcrypt_t *xb_crypt_read_open(void *userdata,
 				  xb_crypt_read_callback *onread);

=== modified file 'src/xbcrypt_read.c'
--- src/xbcrypt_read.c	2013-03-11 19:11:29 +0000
+++ src/xbcrypt_read.c	2013-06-18 23:25:32 +0000
@@ -56,7 +56,7 @@
 	ssize_t		bytesread;
 	xb_rcrypt_result_t result = XB_CRYPT_READ_CHUNK;
 
-	if ((bytesread = crypt->read(crypt->userdata, tmpbuf, sizeof(tmpbuf)))
+	if ((bytesread = crypt->read(crypt->userdata, tmpbuf, sizeof(tmpbuf), MYF(MY_WME)))
 	    != sizeof(tmpbuf)) {
 		if (bytesread == 0) {
 			result = XB_CRYPT_READ_EOF;
@@ -138,7 +138,7 @@
 	}
 
 	if (*elen > 0) {
-		if (crypt->read(crypt->userdata, crypt->buffer, *elen)
+		if (crypt->read(crypt->userdata, crypt->buffer, *elen, MYF(MY_WME|MY_FULL_IO))
 		    != (ssize_t)*elen) {
 			msg("%s:%s: failed to read %lld bytes for chunk payload "
 			    "at offset 0x%llx.\n", my_progname, __FUNCTION__,