Merge lp:~akopytov/percona-xtrabackup/bug1255019-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Automerge from 2.1.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/67/

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

=== modified file 'storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh'
--- storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh	2013-12-27 10:35:03 +0000
@@ -18,9 +18,9 @@
 	while [ $max_lsn -le $stop_lsn ];
 	do
 		$command
-		for i in `ls -1 $arch_log_dir`;
+		for i in $arch_log_dir/*;
 		do
-			local lsn=`echo $i | sed -s 's/ib_log_archive_\([0-9]\+\)/\1/'`
+			local lsn=${i#$arch_log_dir/ib_log_archive_}
 			if [ $lsn -gt $max_lsn ];
 			then
 				max_lsn=$lsn
@@ -326,9 +326,10 @@
 	#set.
 	pushd .
 	cd $ARCHIVED_LOGS_DIR
-	for i in `find . -type f -printf "%T+ %p\n" | cut -d' ' -f2`;
+	for i in *;
 	do
-		local n=`echo $i | sed 's/.*ib_log_archive_\([0-9]*\).*/\1/'`;
+		test -f $i || continue
+		local n=${i#ib_log_archive_}
 		if [ $n -le $LSN ];
 		then
 			mv $i 1/;
@@ -376,4 +377,7 @@
 require_xtradb
 require_server_version_higher_than '5.6.10'
 
+test_archived_logs
+test_archived_logs '' 'ROW_FORMAT=COMPRESSED'
+
 exit $RESULT