SHA256
1
0
forked from pool/mariadb

Accepting request 579673 from server:database

OBS-URL: https://build.opensuse.org/request/show/579673
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2018-02-25 10:32:30 +00:00 committed by Git OBS Bridge
commit 1ca57403d5
8 changed files with 69 additions and 23 deletions

View File

@ -21,7 +21,7 @@ Index: mariadb-10.2.10/mysys_ssl/openssl.c
- EVP_MD_CTX *md5_ctx; - EVP_MD_CTX *md5_ctx;
- -
- if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL)) - if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL))
- return 1; - return 0;
- -
- testing= 1; - testing= 1;
- alloc_size= alloc_count= 0; - alloc_size= alloc_count= 0;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ab22d7fbacfabc30fe18f71a8afb173250074502d889457e3cde2e203d341ec
size 72818636

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iEYEABECAAYFAlpNVUMACgkQy8sIKhu5Q9tRaACfXwknCjVQsgkfCadQfgbANzpO
fV8An2LGzcM1wpmnWOxuDe5AvO/yvqvi
=0wDN
-----END PGP SIGNATURE-----

3
mariadb-10.2.13.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:272e7ed9300a05da9e02f8217a01ed3447c4f5a36a12e5233d62cc7c586fc753
size 72591913

View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iEYEABECAAYFAlqCV40ACgkQy8sIKhu5Q9tYcwCaA9E0IdgHyQdZS9mmL6DEnzk+
AxkAoMj28JOCvnaSwBMaclw+Fu6ALu8S
=7VSx
-----END PGP SIGNATURE-----

View File

@ -17,7 +17,7 @@ Index: scripts/mysqld_safe.sh
pid_file= pid_file=
err_log= err_log=
err_log_base= err_log_base=
@@ -300,6 +301,7 @@ parse_arguments() { @@ -308,6 +309,7 @@ parse_arguments() {
--pid[-_]file=*) pid_file="$val" ;; --pid[-_]file=*) pid_file="$val" ;;
--plugin[-_]dir=*) PLUGIN_DIR="$val" ;; --plugin[-_]dir=*) PLUGIN_DIR="$val" ;;
--user=*) user="$val"; SET_USER=1 ;; --user=*) user="$val"; SET_USER=1 ;;
@ -25,7 +25,7 @@ Index: scripts/mysqld_safe.sh
--log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*) --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*)
pid_file="$val.pid"; pid_file="$val.pid";
err_log_base="$val"; err_log_base="$val";
@@ -713,6 +715,7 @@ then @@ -725,6 +727,7 @@ then
if test "$user" != "root" -o $SET_USER = 1 if test "$user" != "root" -o $SET_USER = 1
then then
USER_OPTION="--user=$user" USER_OPTION="--user=$user"
@ -33,7 +33,7 @@ Index: scripts/mysqld_safe.sh
fi fi
if test -n "$open_files" if test -n "$open_files"
then then
@@ -735,7 +738,12 @@ then @@ -747,7 +750,12 @@ then
log_error "Fatal error Can't create database directory '$mysql_unix_port'" log_error "Fatal error Can't create database directory '$mysql_unix_port'"
exit 1 exit 1
fi fi
@ -51,15 +51,15 @@ Index: scripts/mysql_install_db.sh
=================================================================== ===================================================================
--- scripts/mysql_install_db.sh.orig --- scripts/mysql_install_db.sh.orig
+++ scripts/mysql_install_db.sh +++ scripts/mysql_install_db.sh
@@ -29,6 +29,7 @@ args="" @@ -30,6 +30,7 @@ defaults=""
defaults="" defaults_group_suffix=""
mysqld_opt="" mysqld_opt=""
user="" user=""
+group="" +group=""
silent_startup="--silent-startup" silent_startup="--silent-startup"
force=0 force=0
@@ -89,6 +90,11 @@ Usage: $0 [OPTIONS] @@ -93,6 +94,11 @@ Usage: $0 [OPTIONS]
user. You must be root to use this option. By default user. You must be root to use this option. By default
mysqld runs using your current login name and files and mysqld runs using your current login name and files and
directories that it creates will be owned by you. directories that it creates will be owned by you.
@ -71,7 +71,7 @@ Index: scripts/mysql_install_db.sh
All other options are passed to the mysqld program All other options are passed to the mysqld program
@@ -136,11 +142,11 @@ parse_arguments() @@ -140,11 +146,11 @@ parse_arguments()
--builddir=*) builddir=`parse_arg "$arg"` ;; --builddir=*) builddir=`parse_arg "$arg"` ;;
--srcdir=*) srcdir=`parse_arg "$arg"` ;; --srcdir=*) srcdir=`parse_arg "$arg"` ;;
--ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;;
@ -85,7 +85,7 @@ Index: scripts/mysql_install_db.sh
--skip-name-resolve) ip_only=1 ;; --skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ; silent_startup="" ;; --verbose) verbose=1 ; silent_startup="" ;;
--rpm) in_rpm=1 ;; --rpm) in_rpm=1 ;;
@@ -421,7 +427,12 @@ do @@ -429,7 +435,12 @@ do
fi fi
if test -n "$user" if test -n "$user"
then then
@ -99,7 +99,7 @@ Index: scripts/mysql_install_db.sh
if test $? -ne 0 if test $? -ne 0
then then
echo "Cannot change ownership of the database directories to the '$user'" echo "Cannot change ownership of the database directories to the '$user'"
@@ -436,6 +447,11 @@ then @@ -444,6 +455,11 @@ then
args="$args --user=$user" args="$args --user=$user"
fi fi
@ -115,7 +115,7 @@ Index: scripts/CMakeLists.txt
=================================================================== ===================================================================
--- scripts/CMakeLists.txt.orig --- scripts/CMakeLists.txt.orig
+++ scripts/CMakeLists.txt +++ scripts/CMakeLists.txt
@@ -134,6 +134,7 @@ ENDIF() @@ -161,6 +161,7 @@ ENDIF()
SET(HOSTNAME "hostname") SET(HOSTNAME "hostname")
SET(MYSQLD_USER "mysql") SET(MYSQLD_USER "mysql")

View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Wed Feb 14 11:51:39 UTC 2018 - kstreitova@suse.com
- update to 10.2.13 GA
* notable changes
* InnoDB updated to 5.7.21
* Galera wsrep library updated to 25.3.23
* MDEV-13869 - MariaDB slow start
* MDEV-14611 - ALTER TABLE EXCHANGE PARTITION does not work
properly when used with DATA DIRECTORY
* MDEV-15249 - Crash in MVCC read after IMPORT TABLESPACE
* Foreign key bugs:
* MDEV-15199 - Referential integrity broken in ON DELETE
CASCADE/MDEV-14222 Unnecessary 'cascade' memory allocation
for every updated row
* MDEV-15219 - FOREIGN KEY CASCADE or SET NULL operations will
not resume after lock wait
* MDEV-15042 - INSERT ON DUPLICATE KEY UPDATE produces error
1032 (Can't find record)
* MDEV-13205 - InnoDB: Failing assertion:
!dict_index_is_online_ddl(index) upon ALTER TABLE
* MDEV-14958 - Merge new release of InnoDB MySQL 5.7.21 to 10.2
* MDEV-15165 - InnoDB purge for index on virtual column is
trying to access an incomplete record
* MDEV-15143 - InnoDB: Rollback of trx with id 0 completed
* MDEV-11415 - Remove excessive undo logging during ALTER
TABLE…ALGORITHM=COPY
* MDEV-15016 - multiple page cleaner threads use a lot of CPU
* MDEV-14941 - Timeouts on persistent statistics tables caused
by MDEV-14511
* MDEV-14985 - innodb_undo_log_truncate may be blocked if
transactions were recovered at startup
* MDEV-14441 - InnoDB hangs when setting
innodb_adaptive_hash_index=OFF during UPDATE
* MDEV-14887 - On a 32-bit system, MariaDB 10.2 mishandles
data file sizes exceeding 4GiB
* fixes for the following security vulnerabilities:
* CVE-2018-2562, CVE-2018-2622, CVE-2018-2640, CVE-2018-2665,
CVE-2018-2668, CVE-2018-2612
* release notes and changelog:
https://mariadb.com/kb/en/library/mariadb-10213-release-notes/
https://mariadb.com/kb/en/library/mariadb-10213-changelog/
* fixes [bsc#1058729] and [bsc#1068906]
- refresh mariadb-10.2.10-disable_openssl_compatibility_check.patch
- refresh mariadb-10.2.3-group.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 12 17:12:18 UTC 2018 - dmueller@suse.com Mon Feb 12 17:12:18 UTC 2018 - dmueller@suse.com

View File

@ -49,7 +49,7 @@
%define with_mroonga 0 %define with_mroonga 0
%endif %endif
Name: mariadb Name: mariadb
Version: 10.2.12 Version: 10.2.13
Release: 0 Release: 0
Summary: Server part of MariaDB Summary: Server part of MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception License: SUSE-GPL-2.0-with-FLOSS-exception
@ -543,7 +543,7 @@ cp Docs/README-wsrep Docs/README.wsrep
# Generate various filelists (binaries and manpages) # Generate various filelists (binaries and manpages)
# mariadb.files # mariadb.files
filelist mariabackup mbstream innochecksum mariadb-service-convert my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_install_db mysql_secure_installation mysql_upgrade mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log tokuft_logprint tokuft_logdump tokuftdump mysql_ldb sst_dump >mariadb.files filelist mariabackup mbstream innochecksum mariadb-service-convert my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_install_db mysql_secure_installation mysql_upgrade mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log tokuft_logprint tokuft_logdump tokuftdump mysql_ldb sst_dump myrocks_hotbackup >mariadb.files
# mariadb-client.files # mariadb-client.files
filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor mysqld_safe_helper >mariadb-client.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor mysqld_safe_helper >mariadb-client.files