- Bug#17619241 SERVICE OR MYSQLD_SAFE STARTS PICKING WRONG PLUGIN DIRECTORY

- Updated file_contents test for sles packages

Author: bkandasa

mysql-test/t/file_contents.test

@@ -17,7 +17,7 @@ if ($dir_bin =~ m|/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*";
@@ -35,7 +35,7 @@ if ($dir_bin =~ m|/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: version number in directory name
  $dir_docs = glob "$dir_docs/MySQL-server*";

scripts/mysqld_safe.sh

@@ -504,7 +504,7 @@ if [ -n "${PLUGIN_DIR}" ]; then
  plugin_dir="${PLUGIN_DIR}"
 else
  # Try to find plugin dir relative to basedir
- for dir in lib/mysql/plugin lib/plugin
+ for dir in lib64/mysql/plugin lib64/plugin lib/mysql/plugin lib/plugin
  do
  if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then
  plugin_dir="${MY_BASEDIR_VERSION}/${dir}"