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

Proposed by Vadim Tkachenko
Status: Merged
Approved by: Valentine Gostev
Approved revision: no longer in the source branch.
Merged at revision: 235
Proposed branch: lp:~percona-dev/percona-xtrabackup/bugfix_368945
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 12 lines (+1/-1)
1 file modified
xtrabackup.c (+1/-1)
To merge this branch: bzr merge lp:~percona-dev/percona-xtrabackup/bugfix_368945
Reviewer Review Type Date Requested Status
Valentine Gostev (community) qa Approve
Alexey Kopytov (community) Approve
Review via email: mp+54092@code.launchpad.net

Description of the change

datadir is not needed during prepare stage

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

-----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
Revision history for this message
Valentine Gostev (longbow) wrote :

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

review: Approve (qa)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'xtrabackup.c'
2--- xtrabackup.c 2011-03-18 15:18:11 +0000
3+++ xtrabackup.c 2011-03-19 03:35:38 +0000
4@@ -5754,7 +5754,7 @@
5 if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
6 exit(ho_error);
7
8- if (strcmp(mysql_data_home, "./") == 0) {
9+ if ((!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
10 if (!xtrabackup_print_param)
11 usage();
12 printf("\nxtrabackup: Error: Please set parameter 'datadir'\n");

Subscribers

People subscribed via source and target branches