forked from pool/mariadb
Accepting request 688840 from server:database
OBS-URL: https://build.opensuse.org/request/show/688840 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2bfc62a831
@ -1,41 +0,0 @@
|
||||
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 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:42f4c54c29b7c196bd105bbf4d2ea721f869b14cb7ba436c3566e6dd2760614c
|
||||
size 71907765
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEABECAAYFAlxgmjMACgkQy8sIKhu5Q9s0OQCgxL8Ee/3xsY3vIG1AxLuSZ4kN
|
||||
zWwAnjGqw4WqIs9zCu/EH5LDEfMe6KjK
|
||||
=H0ib
|
||||
-----END PGP SIGNATURE-----
|
||||
3
mariadb-10.2.23.tar.gz
Normal file
3
mariadb-10.2.23.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0c5bab58cdc8ab6206f7e6e9b6f336742a93248c0b9aa7e7a6bb031756ab6c17
|
||||
size 71914588
|
||||
7
mariadb-10.2.23.tar.gz.sig
Normal file
7
mariadb-10.2.23.tar.gz.sig
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEABECAAYFAlyYMdYACgkQy8sIKhu5Q9slMwCfS/gJU5ACW0I38uf0fA/cJ2cs
|
||||
mn0AoLY2uOaqqmu3euYQ6uFtj0QDsTNv
|
||||
=q1/V
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 26 12:45:14 UTC 2019 - Kristýna Streitová <kstreitova@suse.com>
|
||||
|
||||
- update to 10.2.23 GA
|
||||
* notable changes:
|
||||
* InnoDB ALTER TABLE fixes: MDEV-18016, MDEV-18630, MDEV-18775,
|
||||
MDEV-18732, MDEV-18749, MDEV-18637, MDEV-13818, MDEV-17595
|
||||
* MDEV-18878: InnoDB Purge: Optimize away futile table lookups
|
||||
* MDEV-14984: Regression in connect performance
|
||||
* MDEV-18936: Purge thread fails to exit on shutdown
|
||||
* MDEV-18272: InnoDB fails to rollback after exceeding FOREIGN
|
||||
KEY recursion depth
|
||||
* MDEV-9519: Data corruption on Galera cluster size change
|
||||
* MDEV-18204: fix incremental MyRocks backup
|
||||
* MDEV-18611: mariabackup terminated while copying InnoDB
|
||||
redo log
|
||||
* MDEV-18669: mariabackup writes timestamp in version line
|
||||
* MDEV-18855: Mariabackup should fetch innodb_compression_level
|
||||
from running server
|
||||
* fixes for the following security vulnerabilities: none
|
||||
* release notes and changelog:
|
||||
https://mariadb.com/kb/en/library/mariadb-10223-release-notes
|
||||
https://mariadb.com/kb/en/library/mariadb-10223-changelog
|
||||
- remove mariadb-10.2.22-fix_path.patch that is no longer needed
|
||||
(applied upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 27 14:48:43 UTC 2019 - kstreitova@suse.com
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
%define with_mroonga 0
|
||||
%endif
|
||||
Name: mariadb
|
||||
Version: 10.2.22
|
||||
Version: 10.2.23
|
||||
Release: 0
|
||||
Summary: Server part of MariaDB
|
||||
License: SUSE-GPL-2.0-with-FLOSS-exception
|
||||
@ -78,7 +78,6 @@ 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
|
||||
@ -334,7 +333,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
|
||||
%patch8 -p0
|
||||
%patch9 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
|
||||
cp %{_sourcedir}/suse-test-run .
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user