[mariadb-galera] Use configured value instead of hardcoded path in mysql_install_db script Related: #1134328

[Honza Horak]

commit 17e4af9fc4734fbc6565410df99eb36ad7c171a7
Author: Honza Horak <hhorak at redhat.com>
Date:   Fri Sep 5 13:27:47 2014 +0200

    Use configured value instead of hardcoded path in mysql_install_db script
    Related: #1134328

 mariadb-galera.spec               |    2 ++
 mariadb-install-db-sharedir.patch |   26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index 489b16a..27cc40d 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -1188,6 +1188,8 @@ fi
 * Fri Sep 05 2014 Honza Horak <hhorak at redhat.com> - 1:10.0.12-8
 - Install systemd service file on RHEL-7+
   Server requires any mysql package, so it should be fine with older client
+- Use configured value instead of hardcoded path in mysql_install_db script
+  Related: #1134328
 
 * Wed Sep 03 2014 Honza Horak <hhorak at redhat.com> - 1:10.0.12-7
 - Disable failing tests: innodb_simulate_comp_failures_small, key_cache
diff --git a/mariadb-install-db-sharedir.patch b/mariadb-install-db-sharedir.patch
index cf6e3fd..4949b6d 100644
--- a/mariadb-install-db-sharedir.patch
+++ b/mariadb-install-db-sharedir.patch
@@ -1,38 +1,38 @@
-diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
-index 3903140..efbe053 100644
---- a/scripts/mysql_install_db.pl.in
-+++ b/scripts/mysql_install_db.pl.in
+Use configured value instead of hardcoded path
+
+diff -up mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.0.13/scripts/mysql_install_db.pl.in
+--- mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir	2014-09-04 12:50:24.061979080 +0200
++++ mariadb-10.0.13/scripts/mysql_install_db.pl.in	2014-09-04 12:51:22.929045559 +0200
 @@ -318,7 +318,7 @@ elsif ( $opt->{basedir} )
                      find_in_basedir($opt,"file","mysqld-nt",
                                    "bin");  # ,"sql"
    $pkgdatadir     = find_in_basedir($opt,"dir","fill_help_tables.sql",
 -                                    "share","share/mysql");  # ,"scripts"
-+                                    "share","share/mysql","share/mariadb-galera");  # ,"scripts"
++                                    "share","@INSTALL_MYSQLSHAREDIR@");  # ,"scripts"
    $scriptdir      = "$opt->{basedir}/scripts";
  }
  else
-diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
-index 6237a6f..2aa30df 100644
---- a/scripts/mysql_install_db.sh
-+++ b/scripts/mysql_install_db.sh
+diff -up mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir mariadb-10.0.13/scripts/mysql_install_db.sh
+--- mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir	2014-09-04 12:51:59.005086301 +0200
++++ mariadb-10.0.13/scripts/mysql_install_db.sh	2014-09-04 12:54:02.794222597 +0200
 @@ -280,16 +280,16 @@ then
      cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
      exit 1
    fi
 -  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
-+  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english share/mariadb-galera/english`
++  langdir=`find_in_basedir --dir errmsg.sys share/english @INSTALL_MYSQLSHAREDIR@/english`
    if test -z "$langdir"
    then
 -    cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
-+    cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english $basedir/share/mariadb-galera/english
++    cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english
      exit 1
    fi
 -  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
-+  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mariadb-galera`
++  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@`
    if test -z "$pkgdatadir"
    then
 -    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
-+    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql $basedir/share/mariadb-galera
++    cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@
      exit 1
    fi
    scriptdir="$basedir/scripts"