Merge lp:~akopytov/percona-xtrabackup/bug759225-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/49/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-09-16 07:02:15 +0000
+++ innobackupex	2011-09-21 09:42:23 +0000
@@ -801,7 +801,7 @@
                 my $innodb_flush_method = 
                     get_option(\%config, 'mysqld', 'innodb_flush_method');
                 my $innodb_use_odirect;
-                $innodb_use_odirect = 1 if $innodb_flush_method =~ m/O_DIRECT/i;
+                $innodb_use_odirect = 1 if $innodb_flush_method =~ m/^(ALL_)?O_DIRECT$/i;
 
                 my $subdir;
                 my @list;
 
=== added file 'test/t/bug759225.sh'
--- test/t/bug759225.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug759225.sh	2011-09-21 09:42:23 +0000
@@ -0,0 +1,51 @@
+########################################################################
+# Bug #759225: xtrabackup does not support ALL_O_DIRECT for 
+#              innodb_flush_method
+########################################################################
+
+. inc/common.sh
+
+if test "`uname -s`" != "Linux"
+then
+    echo "Requires Linux" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+if [ -z "$XTRADB_VERSION" ]; then
+    echo "Requires XtraDB" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+init
+run_mysqld
+load_sakila
+
+# Take backup
+echo "innodb_flush_method=ALL_O_DIRECT" >> $topdir/my.cnf
+mkdir -p $topdir/backup
+innobackupex --stream=tar $topdir/backup > $topdir/backup/out.tar
+stop_mysqld
+
+# See if tar4ibd was using O_DIRECT
+if ! grep "tar4ibd: using O_DIRECT for the input file" $OUTFILE ;
+then
+  vlog "tar4ibd was not using O_DIRECT for the input file."
+  exit -1
+fi
+
+# Remove datadir
+rm -r $mysql_datadir
+# Restore sakila
+vlog "Applying log"
+backup_dir=$topdir/backup
+cd $backup_dir
+$TAR -ixvf out.tar
+cd - >/dev/null 2>&1 
+innobackupex --apply-log --defaults-file=$topdir/my.cnf $backup_dir
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+innobackupex --copy-back --defaults-file=$topdir/my.cnf $backup_dir
+
+run_mysqld
+# Check sakila
+${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-09-14 12:48:27 +0000
+++ xtrabackup.c	2011-09-21 09:42:23 +0000
@@ -3508,6 +3508,10 @@
 							"async_unbuffered")) {
 	  	srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;	
 #endif
+#ifdef XTRADB_BASED
+	} else if (0 == ut_strcmp(srv_file_flush_method_str, "ALL_O_DIRECT")) {
+		srv_unix_file_flush_method = SRV_UNIX_ALL_O_DIRECT;
+#endif
 	} else {
 	  	fprintf(stderr, 
           	"xtrabackup: Unrecognized value %s for innodb_flush_method\n",