bzr commit into mysql-5.5 branch (holyfoot:3247)

[Alexey Botchkov]

#At file:///home/hf/wmar/mdev57/ based on revid:sanja@stripped

 3247 Alexey Botchkov	2012-01-27
      mdev-57 5.5 main.file_contents fails on debian5-i386-fulltest;
      
      The problem is that the test script cuts all the '/lib' substrings from the
      path. That makes the file_contents.test fail if a path has such a substring.
      
      per-file comments:
        mysql-test/t/file_contents.test
      mdev-57 5.5 main.file_contents fails on debian5-i386-fulltest;
              No '/lib' substring cutting anymore.

    modified:
      mysql-test/t/file_contents.test
=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2012-01-16 19:16:35 +0000
+++ b/mysql-test/t/file_contents.test	2012-01-27 14:02:23 +0000
@@ -35,7 +35,6 @@ if ($dir_bin eq '/usr/') {
 } else {
   # tar.gz package, Windows, or developer work (in BZR)
   $dir_docs = $dir_bin;
-  $dir_docs =~ s|/lib||;
   if(-d "$dir_docs/docs") {
     $dir_docs = "$dir_docs/docs"; # package
   } else {


Attachment: [text/bzr-bundle] bzr/[e-mail]