Merge lp:~percona-dev/percona-xtrabackup/bugfix_368945 into lp:percona-xtrabackup/2.0

[Vadim Tkachenko]

datadir is not needed during prepare stage

[Alexey Kopytov (akopytov)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2Ex8YACgkQPygU5M5poYNyyACfVomjnNWHFjP2ynPh360gvGn6
z4IAn3NC+e/K/y+6uY+yGZWIS/ps59mr
=td7W
-----END PGP SIGNATURE-----

review: Approve

[Valentine Gostev (longbow)]

Verified, --datadir option is not required during prepare.

review: Approve (qa)

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-03-18 15:18:11 +0000
+++ xtrabackup.c	2011-03-19 03:35:38 +0000
@@ -5754,7 +5754,7 @@
 	if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
 		exit(ho_error);
 
-	if (strcmp(mysql_data_home, "./") == 0) {
+	if ((!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
 		if (!xtrabackup_print_param)
 			usage();
 		printf("\nxtrabackup: Error: Please set parameter 'datadir'\n");