rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 437454 from home:kstreitova:branches:server:database

Browse Source 
- update to 10.1.18
  * Release notes:
    https://mariadb.com/kb/en/mariadb/mariadb-10118-release-notes/
    https://mariadb.com/kb/en/mariadb/mariadb-10117-release-notes/
    https://mariadb.com/kb/en/mariadb/mariadb-10116-release-notes/
    https://mariadb.com/kb/en/mariadb/mariadb-10115-release-notes/
  * Changelog:
    https://mariadb.com/kb/en/mariadb/mariadb-10118-changelog/
    https://mariadb.com/kb/en/mariadb/mariadb-10117-changelog/
    https://mariadb.com/kb/en/mariadb/mariadb-10116-changelog/
    https://mariadb.com/kb/en/mariadb/mariadb-10115-changelog/
  * fixed CVE's:
    CVE-2016-8283, CVE-2016-6663, CVE-2016-5629, CVE-2016-5626,
    CVE-2016-5624, CVE-2016-5616, CVE-2016-3492, CVE-2016-6662,
    CVE-2016-5440, CVE-2016-3615, CVE-2016-3521, CVE-2016-3477
  * fix:
    [bsc#1005582], [bsc#1001367], [bsc#1005569], [bsc#1005566],
    [bsc#1005564], [bsc#1005562], [bsc#1005555], [bnc#998309],
    [bsc#989926],  [bsc#989922],  [bsc#989919],  [bsc#989913]
  * refresh mariadb-10.1.4-group.patch
  * refresh mariadb-10.1.12-fortify-and-O.patch
- requires devel packages for aio and lzo2
- remove mariadb-10.0.21-mysql-test_main_bootstrap.patch that is no
  longer needed [bnc#984858]  
- append "--ignore-db-dir=lost+found" to the mysqld options in
  "mysql-systemd-helper" script if "lost+found" directory is found
  in $datadir [bnc#986251]
- remove syslog.target from *.service files [bsc#983938]
- add BuildRequires: systemd-devel
- make some dependecies switchable

OBS-URL: https://build.opensuse.org/request/show/437454
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=184
This commit is contained in:
Martin Pluskal
2016-10-27 08:56:24 +00:00
committed by Git OBS Bridge
parent 09a8f8112d
commit 78803feced
10 changed files with 103 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-systemd-helper
View File

@@ -10,7 +10,7 @@ read_config() {
MYSQLVER="$(echo @MYSQLVER@ | sed 's|\.[0-9]\+$||')"
mysql_daemon_user=mysql
mysql_daemon_group=mysql
if [[ -z "$INSTANCE" || "x$INSTANCE" = "xdefault" ]]; then
if [[ -z "$INSTANCE" ]]; then
datadir=/var/lib/mysql
socket="/var/run/mysql/mysql.sock"
else
@@ -19,7 +19,7 @@ read_config() {
fi
# Read options - important for multi setup
if [[ -n "$INSTANCE" && "x$INSTANCE" != "xdefault" ]]; then
if [[ -n "$INSTANCE" ]]; then
opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi "$INSTANCE")"
tmp_opts="$opts"
config="/etc/my${INSTANCE}.cnf"
@@ -38,6 +38,14 @@ read_config() {
--user=*) mysql_daemon_user="$(echo "$arg" | sed -e 's/^[^=]*=//')" ;;
esac
done
# work-around for lost+found directory in $datadir (bug #986251)
if [ -d "$datadir/lost+found" ]
then
ignore_db_dir="--ignore-db-dir=lost+found"
else
ignore_db_dir=""
fi
}
# Create new empty database if needed
@@ -93,6 +101,7 @@ mysql_upgrade() {
--user="$mysql_daemon_user" \
--skip-networking \
--skip-grant-tables \
$ignore_db_dir \
--log-error="$protected/log_upgrade_run" \
--socket="$protected/mysql.sock" \
--pid-file="$protected/mysqld.pid" &
@@ -151,6 +160,7 @@ mysql_wait() {
mysql_start() {
exec /usr/sbin/mysqld \
--defaults-file="$config" \
$ignore_db_dir \
--user="$mysql_daemon_user"
}