|
 |
2a2834 |
Revert upstream changes to make the mysql_install_dbrelocatable
|
|
|
2a2834 |
|
|
|
2a2834 |
Resolves: #1731062
|
|
|
2a2834 |
|
|
|
2a2834 |
Upstream intended to make the mysql_install_db script to be relocatable, which
|
|
|
2a2834 |
is not a supported use case in RHEL. Because of different layout (mysqld in
|
|
|
2a2834 |
/usr/libexec while all other binaries in /usr/bin) these changes broke
|
|
|
2a2834 |
mysql_install_db if run without arguments (we use --rpm in the systemd so we
|
|
|
2a2834 |
didn't meet this issue there). Reverting changes upstream did fixes the
|
|
|
2a2834 |
standalone run of mysql_install_db again.
|
|
|
2a2834 |
|
|
|
2a2834 |
Original upstream issue: https://jira.mariadb.org/browse/MDEV-14580
|
|
|
2a2834 |
Related fixes that broke the RHEL build:
|
|
|
2a2834 |
https://github.com/MariaDB/server/commit/9c5be7d131f7eb7f27df722463faa2cd8135fd1b
|
|
|
2a2834 |
https://github.com/MariaDB/server/commit/50e593386fcbaa1ca7bd2ed9fdfc51fd5102cdab
|
|
|
2a2834 |
|
|
|
2a2834 |
diff -up mariadb-5.5.65/scripts/mysql_install_db.sh.norellocatable mariadb-5.5.65/scripts/mysql_install_db.sh
|
|
|
2a2834 |
--- mariadb-5.5.65/scripts/mysql_install_db.sh.norellocatable 2019-08-17 07:06:14.135318451 +0200
|
|
|
2a2834 |
+++ mariadb-5.5.65/scripts/mysql_install_db.sh 2019-08-17 07:10:58.702473136 +0200
|
|
|
2a2834 |
@@ -36,9 +36,6 @@ in_rpm=0
|
|
|
2a2834 |
ip_only=0
|
|
|
2a2834 |
cross_bootstrap=0
|
|
|
2a2834 |
|
|
|
2a2834 |
-dirname0=`dirname $0 2>/dev/null`
|
|
|
2a2834 |
-dirname0=`dirname $dirname0 2>/dev/null`
|
|
|
2a2834 |
-
|
|
|
2a2834 |
usage()
|
|
|
2a2834 |
{
|
|
|
2a2834 |
cat <
|
|
|
2a2834 |
@@ -243,16 +238,9 @@ then
|
|
|
2a2834 |
fi
|
|
|
2a2834 |
if test -n "$srcdir"
|
|
|
2a2834 |
then
|
|
|
2a2834 |
- # In an out-of-source build, builddir is not srcdir. Try to guess where
|
|
|
2a2834 |
- # builddir is by looking for my_print_defaults.
|
|
|
2a2834 |
if test -z "$builddir"
|
|
|
2a2834 |
then
|
|
|
2a2834 |
- if test -x "$dirname0/extra/my_print_defaults"
|
|
|
2a2834 |
- then
|
|
|
2a2834 |
- builddir="$dirname0"
|
|
|
2a2834 |
- else
|
|
|
2a2834 |
- builddir="$srcdir"
|
|
|
2a2834 |
- fi
|
|
|
2a2834 |
+ builddir="$srcdir"
|
|
|
2a2834 |
fi
|
|
|
2a2834 |
print_defaults="$builddir/extra/my_print_defaults"
|
|
|
2a2834 |
elif test -n "$basedir"
|
|
|
2a2834 |
@@ -263,9 +251,6 @@ then
|
|
|
2a2834 |
cannot_find_file my_print_defaults $basedir/bin $basedir/extra
|
|
|
2a2834 |
exit 1
|
|
|
2a2834 |
fi
|
|
|
2a2834 |
-elif test -n "$dirname0" -a -x "$dirname0/@bindir@/my_print_defaults"
|
|
|
2a2834 |
-then
|
|
|
2a2834 |
- print_defaults="$dirname0/@bindir@/my_print_defaults"
|
|
|
2a2834 |
else
|
|
|
2a2834 |
print_defaults="@bindir@/my_print_defaults"
|
|
|
2a2834 |
fi
|
|
|
2a2834 |
@@ -317,19 +302,11 @@ then
|
|
|
2a2834 |
cannot_find_file fill_help_tables.sql @pkgdata_locations@
|
|
|
2a2834 |
exit 1
|
|
|
2a2834 |
fi
|
|
|
2a2834 |
-# relative from where the script was run for a relocatable install
|
|
|
2a2834 |
-elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld"
|
|
|
2a2834 |
-then
|
|
|
2a2834 |
- basedir="$dirname0"
|
|
|
2a2834 |
- bindir="$basedir/@INSTALL_SBINDIR@"
|
|
|
2a2834 |
- resolveip="$bindir/resolveip"
|
|
|
2a2834 |
- mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
|
|
|
2a2834 |
- pkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
|
|
|
2a2834 |
else
|
|
|
2a2834 |
basedir="@prefix@"
|
|
|
2a2834 |
bindir="@bindir@"
|
|
|
2a2834 |
resolveip="$bindir/resolveip"
|
|
|
2a2834 |
- mysqld="@sbindir@/mysqld"
|
|
|
2a2834 |
+ mysqld="@libexecdir@/mysqld"
|
|
|
2a2834 |
pkgdatadir="@pkgdatadir@"
|
|
|
2a2834 |
fi
|
|
|
2a2834 |
|