bzr commit into mysql-trunk branch (tor.didriksen:3654)

[Tor Didriksen]

#At file:///export/home/didrik/repo/trunk/ based on revid:bjorn.munch@stripped

 3654 Tor Didriksen	2011-02-16 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/file_contents.test
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-16 11:25:27 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-16 12:58:45 +0000
@@ -2162,6 +2162,7 @@ sub environment_setup {
   $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
   $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
   $ENV{'MYSQL_LIBDIR'}=       "$basedir/lib";
+  $ENV{'MYSQL_BINDIR'}=       "$bindir";
   $ENV{'MYSQL_SHAREDIR'}=     $path_language;
   $ENV{'MYSQL_CHARSETSDIR'}=  $path_charsetsdir;
   

=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2011-02-11 14:55:25 +0000
+++ b/mysql-test/t/file_contents.test	2011-02-16 12:44:28 +0000
@@ -10,7 +10,7 @@
 
 --perl
 print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
-$dir_docs = $ENV{'MYSQL_LIBDIR'};
+$dir_docs = $ENV{'MYSQL_BINDIR'};
 if($dir_docs =~ m|/usr/|) {
   # RPM package
   $dir_docs =~ s|/lib|/share/doc|;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).