forked from pool/mariadb
aa2c3445cb
- add mariadb-10.2.22-fix_path.patch to fix a path to resolveip in mysql_install_db script [bsc#1127027] MDEV-18526 - my.cnf/my.ini: move slow_query_log example to the error log so it's logically together OBS-URL: https://build.opensuse.org/request/show/680087 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=228
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From 431da59f1ce2b594ef465563bf18f670f07a1b32 Mon Sep 17 00:00:00 2001
|
|
From: Oleksandr Byelkin <sanja@mariadb.com>
|
|
Date: Tue, 19 Feb 2019 16:09:46 +0100
|
|
Subject: [PATCH] 1. centos has symlinks /bin->usr/bin and /sbin -> usr/sbin,
|
|
but even if this script called as /bin/mysql_install_db it is still standard
|
|
install and scripts are in /usr/share/ (but not in the /share/) 2. fix of
|
|
bindir path
|
|
|
|
---
|
|
scripts/mysql_install_db.sh | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
Index: mariadb-10.2.22/scripts/mysql_install_db.sh
|
|
===================================================================
|
|
--- mariadb-10.2.22.orig/scripts/mysql_install_db.sh
|
|
+++ mariadb-10.2.22/scripts/mysql_install_db.sh
|
|
@@ -303,6 +303,8 @@ fi
|
|
parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db`
|
|
parse_arguments PICK-ARGS-FROM-ARGV "$@"
|
|
|
|
+rel_mysqld="$dirname0/@INSTALL_SBINDIR@/mysqld"
|
|
+
|
|
# Configure paths to support files
|
|
if test -n "$srcdir"
|
|
then
|
|
@@ -344,12 +346,12 @@ then
|
|
fi
|
|
plugindir=`find_in_dirs --dir auth_socket.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin`
|
|
# relative from where the script was run for a relocatable install
|
|
-elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld"
|
|
+elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld"
|
|
then
|
|
basedir="$dirname0"
|
|
- bindir="$basedir/@INSTALL_SBINDIR@"
|
|
+ bindir="$basedir/@INSTALL_BINDIR@"
|
|
resolveip="$bindir/resolveip"
|
|
- mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
|
|
+ mysqld="$rel_mysqld"
|
|
srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
|
|
buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
|
|
plugindir="$basedir/@INSTALL_PLUGINDIR@"
|