Merge lp:~percona-dev/percona-xtrabackup/fix-bug408966 into lp:percona-xtrabackup/2.0

[Aleksandr Kuzminsky]

[Aleksandr Kuzminsky (akuzminsky)]

Fixed bug408966

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2009-08-05 06:58:35 +0000
+++ xtrabackup.c	2009-08-17 11:32:34 +0000
@@ -323,7 +323,6 @@
 my_bool innobase_rollback_on_timeout		= FALSE;
 my_bool innobase_create_status_file		= FALSE;
 my_bool innobase_adaptive_hash_index		= TRUE;
-my_bool innobase_fast_recovery			= TRUE;
 
 static char *internal_innobase_data_file_path	= NULL;
 
@@ -386,8 +385,7 @@
   OPT_INNODB_OPEN_FILES,
   OPT_INNODB_SYNC_SPIN_LOOPS,
   OPT_INNODB_THREAD_CONCURRENCY,
-  OPT_INNODB_THREAD_SLEEP_DELAY,
-  OPT_INNODB_FAST_RECOVERY
+  OPT_INNODB_THREAD_SLEEP_DELAY
 };
 
 static struct my_option my_long_options[] =
@@ -496,10 +494,6 @@
   {"innodb_doublewrite", OPT_INNODB_DOUBLEWRITE, "Enable InnoDB doublewrite buffer (enabled by default). \
 Disable with --skip-innodb-doublewrite.", (GPTR*) &innobase_use_doublewrite,
    (GPTR*) &innobase_use_doublewrite, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
-  {"innodb_fast_recovery", OPT_INNODB_FAST_RECOVERY,
-   "Enable to use speed hack of recovery avoiding flush list sorting.",
-   (gptr*) &innobase_fast_recovery, (gptr*) &innobase_fast_recovery,
-   0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 /*
   {"innodb_fast_shutdown", OPT_INNODB_FAST_SHUTDOWN,
    "Speeds up the shutdown process of the InnoDB storage engine. Possible "
@@ -636,7 +630,21 @@
 
 static void usage(void)
 {
-  puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
+  puts("Open source backup tool for InnoDB and XtraDB\n\
+\n\
+Copyright (C) 2009 Percona Inc.\n\
+\n\
+This program is free software; you can redistribute it and/or\n\
+modify it under the terms of the GNU General Public License\n\
+as published by the Free Software Foundation version 2\n\
+of the License.\n\
+\n\
+This program is distributed in the hope that it will be useful,\n\
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+GNU General Public License for more details.\n\
+\n\
+You can download full text of the license on http://www.gnu.org/licenses/gpl-2.0.txt\n");
 
   printf("Usage: [%s [--defaults-file=#] --backup | %s [--defaults-file=#] --prepare] [OPTIONS]\n",my_progname,my_progname);
   print_defaults("my",load_default_groups);
@@ -1209,8 +1217,6 @@
 	srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout;
 	srv_force_recovery = (ulint) innobase_force_recovery;
 
-	srv_fast_recovery = (ibool) innobase_fast_recovery;
-
 	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
 	srv_use_checksums = (ibool) innobase_use_checksums;
 
@@ -3349,11 +3355,6 @@
 		"xtrabackup: Using %lld bytes for buffer pool (set by --use-memory parameter)\n",
 		xtrabackup_use_memory);
 
-	if(srv_fast_recovery) {
-		fprintf(stderr,
-"xtrabackup: innodb_fast_recovery option is enabled. (default: false)\n");
-	}
-
 	if(innodb_init())
 		goto error;