bzr commit into mysql-trunk-mtr branch (bjorn.munch:3033)

[Bjorn Munch]

#At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped

 3033 Bjorn Munch	2011-02-24 [merge]
      upmerge some follow-up fixes from 5.5-mtr

    modified:
      mysql-test/lib/My/Find.pm
      mysql-test/mysql-test-run.pl
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
=== modified file 'mysql-test/lib/My/Find.pm'
--- a/mysql-test/lib/My/Find.pm	2011-01-18 10:21:37 +0000
+++ b/mysql-test/lib/My/Find.pm	2011-02-24 14:11:05 +0000
@@ -28,8 +28,6 @@ use My::Platform;
 use base qw(Exporter);
 our @EXPORT= qw(my_find_bin my_find_dir my_find_file NOT_REQUIRED);
 
-our $vs_config_dir;
-
 my $bin_extension= ".exe" if IS_WINDOWS;
 
 # Helper function to be used for fourth parameter to find functions
@@ -158,7 +156,8 @@ sub my_find_paths {
   # User can select to look in a special build dir
   # which is a subdirectory of any of the paths
   my @extra_dirs;
-  my $build_dir= $vs_config_dir || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR};
+  my $build_dir= $::opt_config_dir || $ENV{MTR_VS_CONFIG}
+                                   || $ENV{MTR_BUILD_DIR};
   push(@extra_dirs, $build_dir) if defined $build_dir;
 
   if (defined $extension){

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-21 13:56:58 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-24 15:48:27 +0000
@@ -5702,6 +5702,7 @@ sub run_ctest() {
   chdir ($bindir) or die ("Could not chdir to $bindir");
   my $tinfo;
   my $no_ctest= (IS_WINDOWS) ? 256 : -1;
+  my $ctest_vs= "";
 
   # Just ignore if not configured/built to run ctest
   if (! -f "CTestTestfile.cmake") {
@@ -5709,9 +5710,12 @@ sub run_ctest() {
     return;
   }
 
+  # Add vs-config option if needed
+  $ctest_vs= "-C $opt_vs_config" if $opt_vs_config;
+
   # Also silently ignore if we don't have ctest and didn't insist
   # Now, run ctest and collect output
-  my $ctest_out= `ctest 2>&1`;
+  my $ctest_out= `ctest $ctest_vs 2>&1`;
   if ($? == $no_ctest && $opt_ctest == -1) {
     chdir($olddir);
     return;

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-02-24 15:48:27 +0000
@@ -13,5 +13,6 @@ include/stop_slave_io.inc
 RESET SLAVE;
 drop table t1;
 call mtr.add_suppression("Slave: Can't get stat of .*");
+call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13");
 call mtr.add_suppression("Slave: File.* not found.*");
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-02-24 15:48:27 +0000
@@ -54,6 +54,7 @@ RESET SLAVE;
 drop table t1;
 
 call mtr.add_suppression("Slave: Can't get stat of .*");
+call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13");
 call mtr.add_suppression("Slave: File.* not found.*");
 --let $rpl_only_running_threads= 1
 --source include/rpl_end.inc

No bundle (reason: revision is a merge).