Merge lp:~akopytov/percona-xtrabackup/bug1373429 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/216/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-20 17:05:56 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-25 07:26:36 +0000
@@ -488,7 +488,8 @@
   OPT_XTRA_INCREMENTAL_FORCE_SCAN,
   OPT_DEFAULTS_GROUP,
   OPT_OPEN_FILES_LIMIT,
-  OPT_CLOSE_FILES
+  OPT_CLOSE_FILES,
+  OPT_CORE_FILE
 };
 
 static struct my_option xb_long_options[] =
@@ -863,6 +864,9 @@
    "risk.", (G_PTR*) &xb_close_files, (G_PTR*) &xb_close_files, 0, GET_BOOL,
    NO_ARG, 0, 0, 0, 0, 0, 0},
 
+  {"core-file", OPT_CORE_FILE, "Write core on fatal signals", 0, 0, 0,
+   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -999,6 +1003,9 @@
     }
     xtrabackup_encrypt = TRUE;
     break;
+  case (int) OPT_CORE_FILE:
+    test_flags |= TEST_CORE_ON_SIGNAL;
+    break;
   case '?':
     usage();
     exit(EXIT_SUCCESS);
@@ -5977,12 +5984,14 @@
 	exit(EXIT_FAILURE);
 }
 
-/* ================= main =================== */
-
-int main(int argc, char **argv)
+/**************************************************************************
+Signals-related setup. */
+static
+void
+setup_signals()
+/*===========*/
 {
 	struct sigaction sa;
-	int ho_error;
 
 	/* Print a stacktrace on some signals */
 	sa.sa_flags = SA_RESETHAND | SA_NODEFER;
@@ -6007,6 +6016,16 @@
 		exit(EXIT_FAILURE);
 	}
 #endif
+}
+
+/* ================= main =================== */
+
+int main(int argc, char **argv)
+{
+	int ho_error;
+
+	setup_signals();
+
 	MY_INIT(argv[0]);
 	xb_regex_init();