use mysqld.conf when fetching slave status

[packages/mysql.git] / file-contents.patch

diff --git a/file-contents.patch b/file-contents.patch
index 0a280ba75f0808914406ecac0210a858f36625cb..5cbd412b60ea98588d830d3ed3b851c742aede21 100644 (file)
--- a/file-contents.patch
+++ b/file-contents.patch
@@ -1,7 +1,7 @@
 --- a/mysql-test/t/file_contents.test
 +++ b/mysql-test/t/file_contents.test
-@@ -20,7 +20,7 @@ if ($dir_bin =~ m|/usr/|) {
-     $dir_docs = "$dir_docs/packages/MySQL-server";
+@@ -20,7 +20,7 @@
+     $dir_docs = glob "$dir_docs/packages/MySQL-server*";
    } else {
      # RedHat: version number in directory name
 -    $dir_docs = glob "$dir_docs/MySQL-server*";
@@ -9,10 +9,10 @@
    }
  } elsif ($dir_bin =~ m|/usr$|) {
    # RPM build during development
-@@ -28,9 +28,12 @@ if ($dir_bin =~ m|/usr/|) {
-   if(-d "$dir_docs/packages/MySQL-server") {
-     # SuSE
-     $dir_docs = "$dir_docs/packages/MySQL-server";
+@@ -28,9 +28,12 @@
+   if(-d "$dir_docs/packages") {
+     # SuSE: "packages/" in the documentation path
+     $dir_docs = glob "$dir_docs/packages/MySQL-server*";
 +  } elsif (glob "$dir_docs/percona-server-server*") {
 +    # Debian
 +    $dir_docs = glob "$dir_docs/percona-server-server*";