Merge lp:~percona-dev/percona-xtrabackup/docs-updates-bug-783453 into lp:percona-xtrabackup/2.0

[Rodrigo Gadea]

Removed -g and -z from Usuage | Bug # 783453

[Stewart Smith (stewart)]

This will need to be either resubmitted as a branch with just this fix or along with the fixed libtar patch

review: Needs Fixing

[Stewart Smith (stewart)]

these fixes have been merged in other branches.

Unmerged revisions

256. By Rodrigo Gadea on 2011-05-24

Remove options -g and -z from Usage

255. By Rodrigo Gadea on 2011-05-20

Add File::Temp to handle tmpfiles instead of POSIX "tmpnam"

=== modified file 'innobackupex'
--- innobackupex	2011-05-20 17:23:07 +0000
+++ innobackupex	2011-05-24 23:21:03 +0000
@@ -12,7 +12,7 @@
 use Pod::Usage qw(pod2usage);
 use POSIX "strftime";
 use POSIX ":sys_wait_h";
-use POSIX "tmpnam";
+use File::Temp; # use POSIX "tmpnam";
 use FileHandle;
 use File::Basename;
 use English qw(-no_match_vars);
@@ -148,10 +148,10 @@
 my $mysql_server_version = '';
 
 # name of the file where stderr of mysql process is directed
-my $mysql_stderr = 'stderr';
+my $mysql_stderr = File::Temp->new();
 
 # name of the file where stdout of mysql process is directed
-my $mysql_stdout = 'stdout';
+my $mysql_stdout = File::Temp->new();
 
 # name of the file where binlog position info is written
 my $binlog_info;
@@ -214,6 +214,11 @@
 print_version();
 
 # initialize global variables and perform some checks
+if (!$option_tmpdir){
+    my $tmpdir = File::Temp->newdir();
+    $option_tmpdir = $tmpdir->dirname;
+}
+
 if ($option_copy_back) {
 	if ( $option_ibbackup_binary eq 'autodetect' ) {
 		$option_ibbackup_binary = 'xtrabackup';

=== modified file 'patches/tar4ibd_libtar-1.2.11.patch'
--- patches/tar4ibd_libtar-1.2.11.patch	2011-03-15 21:58:13 +0000
+++ patches/tar4ibd_libtar-1.2.11.patch	2011-05-24 23:21:03 +0000
@@ -531,11 +531,11 @@
  void
  usage()
  {
--	printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n",
-+	printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t < filename.tar\n",
+-	printf("Usage: %s [-C rootdir] -x|-t filename.tar\n",
++	printf("Usage: %s [-C rootdir] -x|-t < filename.tar\n",
  	       progname);
--	printf("       %s [-C rootdir] [-g] [-z] -c filename.tar ...\n",
-+	printf("       %s [-C rootdir] [-g] [-z] [-d] -c ... > filename.tar\n",
+-	printf("       %s [-C rootdir] -c filename.tar ...\n",
++	printf("       %s [-C rootdir] [-d] -c ... > filename.tar\n",
  	       progname);
  	exit(-1);
  }