diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
| commit | 0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb (patch) | |
| tree | 5af5b81499f6137f45a37fc77cc518e40fd4ad72 /mysql-test/t/file_contents.test | |
| parent | e4df6e5799eec20a16e279f7e74e95f18cd475fe (diff) | |
| parent | e02fe87f00dc9fdb0fb6ab13f2e87485f79f3341 (diff) | |
| download | mariadb-git-0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'mysql-test/t/file_contents.test')
| -rw-r--r-- | mysql-test/t/file_contents.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test index c8fdc0251e4..9147727d3e8 100644 --- a/mysql-test/t/file_contents.test +++ b/mysql-test/t/file_contents.test @@ -17,7 +17,7 @@ if ($dir_bin eq '/usr/') { $dir_docs =~ s|/lib|/share/doc|; if(-d "$dir_docs/packages") { # SuSE: "packages/" in the documentation path - $dir_docs = glob "$dir_docs/packages/MySQL-server*"; + $dir_docs = glob "$dir_docs/packages/*-server*"; } else { # RedHat: version number in directory name $dir_docs = glob "$dir_docs/MySQL-server*"; @@ -27,7 +27,7 @@ if ($dir_bin eq '/usr/') { $dir_docs = "$dir_bin/share/doc"; if(-d "$dir_docs/packages") { # SuSE: "packages/" in the documentation path - $dir_docs = glob "$dir_docs/packages/MySQL-server*"; + $dir_docs = glob "$dir_docs/packages/*-server*"; } else { # RedHat/Debian: version number in directory name $dir_docs = glob "$dir_docs/mariadb-server-*"; |