Merge lp:~akopytov/percona-xtrabackup/bug884737-1.7 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/79/

[Stewart Smith (stewart)]

(yes, this was actually approved. also in 1.6 merge req)

review: Approve

=== modified file 'doc/source/innobackupex/how_innobackupex_works.rst'
--- doc/source/innobackupex/how_innobackupex_works.rst	2011-10-21 17:47:31 +0000
+++ doc/source/innobackupex/how_innobackupex_works.rst	2011-11-01 23:18:49 +0000
@@ -59,7 +59,7 @@
 
 Finally, the binary log position will be printed to ``STDERR`` and |innobackupex| will exit returning 0 if all went OK.
 
-Note that the ``STDERR`` of |innobackupex| is not written in any file. You will have to redirect it to a file, e.g., ``innobackupex OPTIONS > backupout.log``.
+Note that the ``STDERR`` of |innobackupex| is not written in any file. You will have to redirect it to a file, e.g., ``innobackupex OPTIONS 2> backupout.log``.
 
 .. _copy-back-ibk:
 

=== modified file 'doc/source/innobackupex/privileges.rst'
--- doc/source/innobackupex/privileges.rst	2011-07-28 05:29:04 +0000
+++ doc/source/innobackupex/privileges.rst	2011-11-01 23:18:49 +0000
@@ -8,7 +8,7 @@
 
 Permissions are those which permits a user to perform operations on the system, like reading, writing or executing on a certain directory or start/stop a system service. **They are set at a system level and only apply to system users**.
 
-Whether |xtrabackup| or |innobackupex| is used, there are two actors involved: the user invoking the program - *a system user* - and the user performing action in the database server - *a database server*. Note that these are different users on different places, despite they may have the same username.
+Whether |xtrabackup| or |innobackupex| is used, there are two actors involved: the user invoking the program - *a system user* - and the user performing action in the database server - *a database user*. Note that these are different users on different places, despite they may have the same username.
 
 All the invocations of |innobackupex| and |xtrabackup| in this documentation assumes that the system user has the appropriate permissions and you are providing the relevant options for connecting the database server - besides the options for the action to be performed - and the database user has adequate privileges. 
 

=== added file 'test/t/bug884737.sh'
--- test/t/bug884737.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug884737.sh	2011-11-01 23:18:49 +0000
@@ -0,0 +1,14 @@
+########################################################################
+# Bug #884737: xtrabackup's --parallel option asserts / crashes with a
+#              value of -1
+########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld 
+
+# Check that --parallel=<negative value> doesn't blow up
+vlog "Creating the backup directory: $topdir/backup"
+mkdir -p $topdir/backup
+innobackupex $topdir/backup --parallel=-1  

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-10-05 02:31:10 +0000
+++ xtrabackup.c	2011-11-01 23:18:49 +0000
@@ -708,7 +708,7 @@
 
 ibool xtrabackup_logfile_is_renamed = FALSE;
 
-uint parallel;
+int parallel;
 
 /* === metadata of backup === */
 #define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints"
@@ -1043,8 +1043,8 @@
   {"parallel", OPT_XTRA_PARALLEL,
    "Number of threads to use for parallel datafiles transfer. Does not have "
    "any effect in the stream mode. The default value is 1.",
-   (G_PTR*) &parallel, (G_PTR*) &parallel, 0, GET_UINT, REQUIRED_ARG,
-   1, 1, UINT_MAX, 0, 0, 0},
+   (G_PTR*) &parallel, (G_PTR*) &parallel, 0, GET_INT, REQUIRED_ARG,
+   1, 1, INT_MAX, 0, 0, 0},
 
   {"innodb_adaptive_hash_index", OPT_INNODB_ADAPTIVE_HASH_INDEX,
    "Enable InnoDB adaptive hash index (enabled by default).  "
@@ -4107,7 +4107,7 @@
 		count = parallel;
 		count_mutex = OS_MUTEX_CREATE();
 
-		for (i = 0; i < parallel; i++) {
+		for (i = 0; i < (uint) parallel; i++) {
 			data_threads[i].it = it;
 			data_threads[i].num = i+1;
 			data_threads[i].count = &count;