Merge lp:~akopytov/percona-xtrabackup/bug1206363 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

  Bug #1206363: xtrabackup: Unrecognized value O_DIRECT_NO_FSYNC for
                innodb_flush_method

  Added O_DIRECT_NO_FSYNC to the list of supported innodb_flush_method in
  xtrabackup_56.

[Alexey Kopytov (akopytov)]

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

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-07-27 10:57:55 +0000
+++ src/xtrabackup.cc	2013-07-30 07:19:28 +0000
@@ -2969,6 +2969,12 @@
 		srv_unix_file_flush_method = SRV_UNIX_ALL_O_DIRECT;
 		msg("xtrabackup: using ALL_O_DIRECT\n");
 #endif
+#if MYSQL_VERSION_ID > 50600
+	} else if (0 == ut_strcmp(srv_file_flush_method_str,
+				  "O_DIRECT_NO_FSYNC")) {
+		srv_unix_file_flush_method = SRV_UNIX_O_DIRECT_NO_FSYNC;
+		msg("xtrabackup: using O_DIRECT_NO_FSYNC\n");
+#endif
 	} else {
 	  	msg("xtrabackup: Unrecognized value %s for "
 		    "innodb_flush_method\n", srv_file_flush_method_str);

=== added file 'test/t/bug1206363.sh'
--- test/t/bug1206363.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1206363.sh	2013-07-30 07:19:28 +0000
@@ -0,0 +1,14 @@
+########################################################################
+# Bug #1206363: xtrabackup: Unrecognized value O_DIRECT_NO_FSYNC for
+#               innodb_flush_method
+########################################################################
+
+require_server_version_higher_than 5.6.6
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_flush_method=O_DIRECT_NO_FSYNC
+"
+
+start_server
+
+innobackupex --no-timestamp $topdir/backup