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

[Alexey Kopytov]

Automerge from 2.1.

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

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-09 17:09:09 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-10 08:54:48 +0000
@@ -6047,6 +6047,12 @@
 	if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))
 		exit(ho_error);
 
+	if (argc != 0) {
+		msg("xtrabackup: Error: unknown argument: '%s'\n",
+		    argv[0]);
+		exit(EXIT_FAILURE);
+	}
+
 	if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
 		if (!xtrabackup_print_param)
 			usage();
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1367377.sh'
--- storage/innobase/xtrabackup/test/t/bug1367377.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1367377.sh	2014-09-10 08:54:48 +0000
@@ -0,0 +1,13 @@
+################################################################################
+# Bug #1367377: xtrabackup should reject unknown arguments which are not options
+################################################################################
+
+start_server
+
+run_cmd_expect_failure $XB_BIN $XB_ARGS --backup foo
+
+test -d xtrabackup_backupfiles && die "Default backup directory found" || true
+
+run_cmd_expect_failure $XB_BIN $XB_ARGS foo --backup
+
+test -d xtrabackup_backupfiles && die "Default backup directory found" || true