From 24ae267a59cbc56a8201abca1579942d8187a585 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Thu, 4 Sep 2014 15:36:04 +0200
Subject: [PATCH] Fix paths in mysql_install_db script Resolves: #1134328
---
mariadb-install-db-sharedir.patch | 38 +++++++++++++++++++++++++++++++
mariadb.spec | 8 ++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 mariadb-install-db-sharedir.patch
diff --git a/mariadb-install-db-sharedir.patch b/mariadb-install-db-sharedir.patch
new file mode 100644
index 0000000..4949b6d
--- /dev/null
+++ b/mariadb-install-db-sharedir.patch
@@ -0,0 +1,38 @@
+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","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts"
+ $scriptdir = "$opt->{basedir}/scripts";
+ }
+ else
+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 @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/@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 @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/@INSTALL_MYSQLSHAREDIR@
+ exit 1
+ fi
+ scriptdir="$basedir/scripts"
diff --git a/mariadb.spec b/mariadb.spec
index c9ffd73..893b426 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -100,7 +100,7 @@
Name: %{pkgname}
Version: %{compatver}.%{bugfixver}
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@@ -143,6 +143,7 @@ Patch5: %{pkgnamepatch}-cipherspec.patch
Patch6: %{pkgnamepatch}-file-contents.patch
Patch7: %{pkgnamepatch}-dh1024.patch
Patch8: %{pkgnamepatch}-scripts.patch
+Patch9: %{pkgnamepatch}-install-db-sharedir.patch
# Patches specific for this mysql package
Patch30: %{pkgnamepatch}-errno.patch
@@ -445,6 +446,7 @@ MariaDB is a community developed branch of MySQL.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
@@ -1119,6 +1121,10 @@ fi
%endif
%changelog
+* Thu Sep 04 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-5
+- Fix paths in mysql_install_db script
+ Resolves: #1134328
+
* Tue Aug 19 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-4
- Build config subpackage everytime
- Disable failing tests: innodb_simulate_comp_failures_small, key_cache