Merge lp:~akopytov/percona-xtrabackup/bug1214730-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/440/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'test/run.sh'
--- test/run.sh	2013-07-25 15:04:49 +0000
+++ test/run.sh	2013-08-21 12:49:10 +0000
@@ -74,12 +74,14 @@
         exit -1
     fi
 
-    if [ "$NWORKERS" -gt 16 ]
+    XB_TEST_MAX_WORKERS=${XB_TEST_MAX_WORKERS:-16}
+    if [ "$NWORKERS" -gt $XB_TEST_MAX_WORKERS ]
     then
-        echo "Autodetected number of cores: $NWORKERS"
-        echo "Limiting to 16 to avoid excessive resource consumption"
-
-        NWORKERS=16
+        cat <<EOF
+Autodetected number of cores: $NWORKERS
+Limiting to $XB_TEST_MAX_WORKERS to avoid excessive resource consumption
+EOF
+        NWORKERS=$XB_TEST_MAX_WORKERS
     fi
 }