Merge lp:~akopytov/percona-xtrabackup/ST-26761-bug1065561-2.0 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Sergei Glushchenko (sergei.glushchenko)]

Approve G2

review: Approve (g2)

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

(this seems to cleanly merge into 2.1 tree too, so i'm merging it)

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-09-13 10:28:54 +0000
+++ src/xtrabackup.c	2012-10-19 16:06:20 +0000
@@ -1081,6 +1081,9 @@
   OPT_INNODB_READ_IO_THREADS,
   OPT_INNODB_WRITE_IO_THREADS,
 #endif
+#if MYSQL_VERSION_ID >= 50500
+  OPT_INNODB_USE_NATIVE_AIO,
+#endif
 #ifdef XTRADB_BASED
   OPT_INNODB_PAGE_SIZE,
   OPT_INNODB_LOG_BLOCK_SIZE,
@@ -1350,6 +1353,13 @@
    "How many files at the maximum InnoDB keeps open at the same time.",
    (G_PTR*) &innobase_open_files, (G_PTR*) &innobase_open_files, 0,
    GET_LONG, REQUIRED_ARG, 300L, 10L, LONG_MAX, 0, 1L, 0},
+#if MYSQL_VERSION_ID >= 50500
+  {"innodb_use_native_aio", OPT_INNODB_USE_NATIVE_AIO,
+   "Use native AIO if supported on this platform.",
+   (G_PTR*) &srv_use_native_aio,
+   (G_PTR*) &srv_use_native_aio, 0, GET_BOOL, NO_ARG,
+   FALSE, 0, 0, 0, 0, 0},
+#endif
 #ifdef XTRADB_BASED
   {"innodb_page_size", OPT_INNODB_PAGE_SIZE,
    "The universal page size of the database.",
@@ -4018,6 +4028,10 @@
 #endif
 	fil_system = NULL;
 
+	/* Reset srv_file_io_threads to its default value to avoid confusing
+	warning on --prepare in innobase_start_or_create_for_mysql()*/
+	srv_n_file_io_threads = 4;
+
 	srv_shutdown_state = SRV_SHUTDOWN_NONE;
 }
 
@@ -6432,7 +6446,12 @@
 
 	/* increase IO threads */
 	if(srv_n_file_io_threads < 10) {
+#ifndef INNODB_VERSION_SHORT
 		srv_n_file_io_threads = 10;
+#else
+		srv_n_read_io_threads = 4;
+		srv_n_write_io_threads = 4;
+#endif
 	}
 
 	msg("xtrabackup: Starting InnoDB instance for recovery.\n"