Accepting request 680087 from home:kstreitova:branches:server:database
- 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
This commit is contained in:
parent
e573f3df3b
commit
aa2c3445cb
41
mariadb-10.2.22-fix_path.patch
Normal file
41
mariadb-10.2.22-fix_path.patch
Normal file
@ -0,0 +1,41 @@
|
||||
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@"
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 27 14:48:43 UTC 2019 - kstreitova@suse.com
|
||||
|
||||
- add mariadb-10.2.22-fix_path.patch to fix a path to resolveip in
|
||||
mysql_install_db script [bsc#1127027] MDEV-18526
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 15:46:53 UTC 2019 - kstreitova@suse.com
|
||||
|
||||
- my.cnf/my.ini: move slow_query_log example to the error log so
|
||||
it's logically together
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 18 21:58:17 UTC 2019 - suse+build@de-korte.org
|
||||
|
||||
|
@ -78,6 +78,7 @@ Patch7: mariadb-10.0.15-logrotate-su.patch
|
||||
Patch8: mariadb-10.2.4-fortify-and-O.patch
|
||||
Patch9: mariadb-10.2.19-link-and-enable-c++11-atomics.patch
|
||||
Patch11: mariadb-10.2.9-galera_cnf.patch
|
||||
Patch12: mariadb-10.2.22-fix_path.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
BuildRequires: dos2unix
|
||||
@ -333,6 +334,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
|
||||
%patch8 -p0
|
||||
%patch9 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
|
||||
cp %{_sourcedir}/suse-test-run .
|
||||
|
||||
|
8
my.ini
8
my.ini
@ -18,6 +18,10 @@ bind-address = 127.0.0.1
|
||||
# which is not beneficial for rotating the log file if it grows in size.
|
||||
log-error = /var/log/mysql/mysqld.log
|
||||
|
||||
# Enable the slow query log to see queries with especially long duration
|
||||
# slow_query_log=1
|
||||
# slow_query_log_file = /var/log/mysql/mysqld_slow.log
|
||||
|
||||
# Operations 'LOAD DATA', 'SELECT ... INTO' and 'LOAD FILE()' will only
|
||||
# work with files in the specified directory
|
||||
secure_file_priv = /var/lib/mysql-files
|
||||
@ -63,10 +67,6 @@ server-id = 1
|
||||
|
||||
sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
|
||||
|
||||
# Enable the slow query log to see queries with especially long duration
|
||||
# slow_query_log=1
|
||||
# slow_query_log_file = /var/log/mysql/mysqld_slow.log
|
||||
|
||||
[mysqld_multi]
|
||||
mysqld = /usr/bin/mysqld_safe
|
||||
mysqladmin = /usr/bin/mysqladmin
|
||||
|
Loading…
Reference in New Issue
Block a user