[mariadb-galera/f20] Fix paths in mysql_install_db script Resolves: #1134328

[rohara]

commit 7e05519fca802a508d03f32ae79d8a83d35d41ca
Author: Ryan O'Hara <rohara at redhat.com>
Date:   Tue Sep 2 21:44:18 2014 -0500

    Fix paths in mysql_install_db script
    Resolves: #1134328

 mariadb-galera.spec               |    8 ++++++-
 mariadb-install-db-sharedir.patch |   38 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index e2797b0..57116f0 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -7,7 +7,7 @@
 
 Name: mariadb-galera
 Version: 5.5.39
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -75,6 +75,7 @@ Patch18: mariadb-covscan-stroverflow.patch
 Patch19: mariadb-config.patch
 Patch20: mariadb-ssltest.patch
 Patch21: mariadb-sharedir.patch
+Patch22: mariadb-install-db-sharedir.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -297,6 +298,7 @@ MariaDB is a community developed branch of MySQL.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -929,6 +931,10 @@ fi
 # %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Sep 02 2014 Ryan O'Hara <rohara at redhat.com> - 1:5.5.39-2
+- Fix paths in mysql_install_db script
+  Resolves: #1134328
+
 * Fri Aug 22 2014 Honza Horak <hhorak at redhat.com> - 1:5.5.39-1
 - Update to 5.5.39
 
diff --git a/mariadb-install-db-sharedir.patch b/mariadb-install-db-sharedir.patch
new file mode 100644
index 0000000..cf6e3fd
--- /dev/null
+++ b/mariadb-install-db-sharedir.patch
@@ -0,0 +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
+@@ -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"
+   $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
+@@ -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`
+   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
+     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`
+   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
+     exit 1
+   fi
+   scriptdir="$basedir/scripts"