bzr push into mysql-5.5 branch (sayantan.dutta:4105 to 4106)

[sayantan.dutta]

 4106 sayantan.dutta@stripped	2012-12-11 [merge]
      upmerge 14737171 5.1 => 5.5

    modified:
      mysql-test/mysql-test-run.pl
 4105 Joerg Bruehe	2012-12-11 [merge]
      Merge ULN RPM stuff to main branch.

    modified:
      packaging/rpm-uln/mysql.spec.sh
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-11-20 10:03:45 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-12-11 13:05:52 +0000
@@ -696,6 +696,8 @@ sub run_test_server ($$$) {
 	    else {
 	      mtr_report("\nRetrying test $tname, ".
 			 "attempt($retries/$opt_retry)...\n");
+              my $log_file_name= $opt_vardir."/log/".$result->{shortname}.".log";
+              rename $log_file_name,$log_file_name.".failed";
 	      delete($result->{result});
 	      $result->{retries}= $retries+1;
 	      $result->write_test($sock, 'TESTCASE');

No bundle (reason: useless for push emails).