~tsarev/percona-server/bug721176

« back to all changes in this revision

Viewing changes to patches/file-contents.patch

  • Committer: Stewart Smith
  • Date: 2011-08-16 02:52:57 UTC
  • mfrom: (148.1.5 5.5.15-porting)
  • Revision ID: stewart@flamingspork.com-20110816025257-0e7elba7i8tlrf50
merge 5.5.15 rebase

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
--- a/mysql-test/t/file_contents.test
2
2
+++ b/mysql-test/t/file_contents.test
3
 
@@ -20,7 +20,7 @@ if ($dir_bin =~ m|/usr/|) {
 
3
@@ -20,7 +20,7 @@
4
4
     $dir_docs = "$dir_docs/packages/MySQL-server";
5
5
   } else {
6
6
     # RedHat: version number in directory name
9
9
   }
10
10
 } elsif ($dir_bin =~ m|/usr$|) {
11
11
   # RPM build during development
12
 
@@ -28,9 +28,12 @@ if ($dir_bin =~ m|/usr/|) {
 
12
@@ -28,9 +28,12 @@
13
13
   if(-d "$dir_docs/packages/MySQL-server") {
14
14
     # SuSE
15
15
     $dir_docs = "$dir_docs/packages/MySQL-server";