bzr push into mysql-5.6 branch (sayantan.dutta:4757 to 4758)

[sayantan.dutta]

 4758 sayantan.dutta@stripped	2012-12-12 [merge]
      upmerge 14737171 5.5=>5.6

    modified:
      mysql-test/mysql-test-run.pl
 4757 Akhila Maddukuri	2012-12-12
      Added subselect_notembedded-master.opt file to fix
      subselect_notembedded.test failure on PB2.

    added:
      mysql-test/t/subselect_notembedded-master.opt
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-12-11 15:45:11 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-12-12 09:42:50 +0000
@@ -701,7 +701,9 @@ 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";
+              #saving the log file as filename.failed in case of retry
+              my $worker_logdir= $result->{savedir};
+              my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
               rename $log_file_name,$log_file_name.".failed";
 	      delete($result->{result});
 	      $result->{retries}= $retries+1;

No bundle (reason: useless for push emails).