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

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

Browse Source 
- update to 10.2.24 GA [bsc#1122198]
  * notable changes:
    * MDEV-18968 - Both (WHERE 0.1) and (WHERE NOT 0.1) return empty set
    * MDEV-18466 - Unsafe to log updates on tables referenced by
      foreign keys with triggers in statement format
    * MDEV-18899 - Server crashes in Field::set_warning_truncated_wrong_value
    * MDEV-18298 - Crashes server with segfault during role grants
    * MDEV-17610 - Unexpected connection abort after certain operations
      from within stored procedure
    * MDEV-19112 - WITH clause does not work with information_schema 
      as default database
    * MDEV-17830 - Server crashes in Item_null_result::field_type upon
      SELECT with CHARSET(date) and ROLLUP
    * MDEV-14041 - Server crashes in String::length on queries with
      functions and ROLLUP
    * MDEV-18920 - Prepared statements with st_convexhull hang and
      eat 100% cpu.
    * MDEV-15837 - Assertion item1->type() == Item::FIELD_ITEM &&
      item2->type() == Item::FIELD_ITEM
    * MDEV-9531 - GROUP_CONCAT with ORDER BY inside takes a lot of
      memory while it's executed
    * MDEV-17036 - BULK with replace doesn't take the first parameter
      in account
    * Bug#28986737 - RENAMING AND REPLACING MYSQL.USER TABLE CAN
      LEAD TO A SERVER CRASH
    * MDEV-19350 - Server crashes in delete_tree_element / ... /
      Item_func_group_concat::repack_tree
    * MDEV-19188 - Server Crash When Using a Trigger With A Number
      of Virtual Columns on INSERT/UPDATE
    * MDEV-19352 - Server crash in alloc_histograms_for_table_share

OBS-URL: https://build.opensuse.org/request/show/703404
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=230
This commit is contained in:
Martin Pluskal 2019-05-19 16:21:15 +00:00 committed by Git OBS Bridge
parent 3082d2eeb9
commit a89ec44e90
7 changed files with 118 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
mariadb-10.2.19-link-and-enable-c++11-atomics.patch
View File

@ -1,7 +1,8 @@
diff -Nru mariadb-10.2.19.orig/configure.cmake mariadb-10.2.19/configure.cmake
--- mariadb-10.2.19.orig/configure.cmake 2018-11-12 17:32:38.000000000 +0100
+++ mariadb-10.2.19/configure.cmake 2018-11-30 14:02:10.883523898 +0100
@@ -946,6 +946,21 @@
Index: mariadb-10.2.24/configure.cmake
===================================================================
--- mariadb-10.2.24.orig/configure.cmake
+++ mariadb-10.2.24/configure.cmake
@@ -946,6 +946,21 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
}"
HAVE_GCC_ATOMIC_BUILTINS)
CHECK_CXX_SOURCE_COMPILES("
@ -23,9 +24,10 @@ diff -Nru mariadb-10.2.19.orig/configure.cmake mariadb-10.2.19/configure.cmake
int main()
{
long long int var= 1;
diff -Nru mariadb-10.2.19.orig/include/atomic/gcc_builtins.h mariadb-10.2.19/include/atomic/gcc_builtins.h
--- mariadb-10.2.19.orig/include/atomic/gcc_builtins.h 2018-11-12 17:32:38.000000000 +0100
+++ mariadb-10.2.19/include/atomic/gcc_builtins.h 2018-11-30 17:21:09.058725896 +0100
Index: mariadb-10.2.24/include/atomic/gcc_builtins.h
===================================================================
--- mariadb-10.2.24.orig/include/atomic/gcc_builtins.h
+++ mariadb-10.2.24/include/atomic/gcc_builtins.h
@@ -16,6 +16,72 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
@ -124,9 +126,10 @@ diff -Nru mariadb-10.2.19.orig/include/atomic/gcc_builtins.h mariadb-10.2.19/inc
#endif
#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */
diff -Nru mariadb-10.2.19.orig/include/my_atomic.h mariadb-10.2.19/include/my_atomic.h
--- mariadb-10.2.19.orig/include/my_atomic.h 2018-11-12 17:32:38.000000000 +0100
+++ mariadb-10.2.19/include/my_atomic.h 2018-11-30 19:56:59.756543856 +0100
Index: mariadb-10.2.24/include/my_atomic.h
===================================================================
--- mariadb-10.2.24.orig/include/my_atomic.h
+++ mariadb-10.2.24/include/my_atomic.h
@@ -104,7 +104,6 @@
but can be added, if necessary.
*/
@ -158,7 +161,7 @@ diff -Nru mariadb-10.2.19.orig/include/my_atomic.h mariadb-10.2.19/include/my_at
/* define missing functions by using the already generated ones */
#ifndef make_atomic_add_body
#define make_atomic_add_body(S) \
@@ -297,20 +298,6 @@
@@ -297,20 +298,6 @@ make_atomic_store(32)
make_atomic_store(64)
make_atomic_store(ptr)
@ -179,7 +182,7 @@ diff -Nru mariadb-10.2.19.orig/include/my_atomic.h mariadb-10.2.19/include/my_at
#ifdef _atomic_h_cleanup_
#include _atomic_h_cleanup_
#undef _atomic_h_cleanup_
@@ -345,6 +332,7 @@
@@ -345,6 +332,7 @@ make_atomic_store(ptr)
#undef make_atomic_store_body
#undef make_atomic_fas_body
#undef intptr
@ -187,7 +190,7 @@ diff -Nru mariadb-10.2.19.orig/include/my_atomic.h mariadb-10.2.19/include/my_at
/*
the macro below defines (as an expression) the code that
@@ -355,6 +343,20 @@
@@ -355,6 +343,20 @@ make_atomic_store(ptr)
#define LF_BACKOFF (1)
#endif
@ -208,10 +211,11 @@ diff -Nru mariadb-10.2.19.orig/include/my_atomic.h mariadb-10.2.19/include/my_at
#define MY_ATOMIC_OK 0
#define MY_ATOMIC_NOT_1CPU 1
extern int my_atomic_initialize();
diff -Nru mariadb-10.2.19.orig/libmysqld/CMakeLists.txt mariadb-10.2.19/libmysqld/CMakeLists.txt
--- mariadb-10.2.19.orig/libmysqld/CMakeLists.txt 2018-11-12 17:32:38.000000000 +0100
+++ mariadb-10.2.19/libmysqld/CMakeLists.txt 2018-11-30 14:04:42.644814203 +0100
@@ -137,7 +137,7 @@
Index: mariadb-10.2.24/libmysqld/CMakeLists.txt
===================================================================
--- mariadb-10.2.24.orig/libmysqld/CMakeLists.txt
+++ mariadb-10.2.24/libmysqld/CMakeLists.txt
@@ -137,7 +137,7 @@ ENDIF()
SET(LIBS
@ -220,10 +224,11 @@ diff -Nru mariadb-10.2.19.orig/libmysqld/CMakeLists.txt mariadb-10.2.19/libmysql
${ZLIB_LIBRARY} ${SSL_LIBRARIES}
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
${MYSQLD_STATIC_PLUGIN_LIBS}
diff -Nru mariadb-10.2.19.orig/sql/CMakeLists.txt mariadb-10.2.19/sql/CMakeLists.txt
--- mariadb-10.2.19.orig/sql/CMakeLists.txt 2018-11-12 17:32:42.000000000 +0100
+++ mariadb-10.2.19/sql/CMakeLists.txt 2018-11-30 14:04:10.792542946 +0100
@@ -168,7 +168,8 @@
Index: mariadb-10.2.24/sql/CMakeLists.txt
===================================================================
--- mariadb-10.2.24.orig/sql/CMakeLists.txt
+++ mariadb-10.2.24/sql/CMakeLists.txt
@@ -168,7 +168,8 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
${WSREP_LIB}
${SSL_LIBRARIES}
@ -233,31 +238,34 @@ diff -Nru mariadb-10.2.19.orig/sql/CMakeLists.txt mariadb-10.2.19/sql/CMakeLists
IF(WIN32)
SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
diff -Nru mariadb-10.2.19.orig/storage/perfschema/unittest/CMakeLists.txt mariadb-10.2.19/storage/perfschema/unittest/CMakeLists.txt
--- mariadb-10.2.19.orig/storage/perfschema/unittest/CMakeLists.txt 2018-11-12 17:32:44.000000000 +0100
+++ mariadb-10.2.19/storage/perfschema/unittest/CMakeLists.txt 2018-11-30 14:03:04.827981923 +0100
@@ -29,4 +29,4 @@
Index: mariadb-10.2.24/storage/perfschema/unittest/CMakeLists.txt
===================================================================
--- mariadb-10.2.24.orig/storage/perfschema/unittest/CMakeLists.txt
+++ mariadb-10.2.24/storage/perfschema/unittest/CMakeLists.txt
@@ -29,4 +29,4 @@ ADD_DEPENDENCIES(pfs_server_stubs GenErr
MY_ADD_TESTS(pfs_instr_class pfs_instr_class-oom pfs_instr pfs_instr-oom
pfs_account-oom pfs_host-oom pfs_timer pfs_user-oom pfs pfs_misc
- EXT "cc" LINK_LIBRARIES perfschema mysys pfs_server_stubs)
+ EXT "cc" LINK_LIBRARIES perfschema mysys pfs_server_stubs ${LIBATOMIC})
diff -Nru mariadb-10.2.19.orig/unittest/mysys/CMakeLists.txt mariadb-10.2.19/unittest/mysys/CMakeLists.txt
--- mariadb-10.2.19.orig/unittest/mysys/CMakeLists.txt 2018-11-12 17:32:47.000000000 +0100
+++ mariadb-10.2.19/unittest/mysys/CMakeLists.txt 2018-11-30 19:43:56.989605864 +0100
Index: mariadb-10.2.24/unittest/mysys/CMakeLists.txt
===================================================================
--- mariadb-10.2.24.orig/unittest/mysys/CMakeLists.txt
+++ mariadb-10.2.24/unittest/mysys/CMakeLists.txt
@@ -15,7 +15,7 @@
MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
aes
aes byte_order
- LINK_LIBRARIES mysys)
+ LINK_LIBRARIES mysys ${LIBATOMIC})
MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
ADD_DEFINITIONS(${SSL_DEFINES})
diff -Nru mariadb-10.2.19.orig/unittest/sql/CMakeLists.txt mariadb-10.2.19/unittest/sql/CMakeLists.txt
--- mariadb-10.2.19.orig/unittest/sql/CMakeLists.txt 2018-11-12 17:32:47.000000000 +0100
+++ mariadb-10.2.19/unittest/sql/CMakeLists.txt 2018-11-30 14:03:38.452267771 +0100
@@ -27,7 +27,7 @@
Index: mariadb-10.2.24/unittest/sql/CMakeLists.txt
===================================================================
--- mariadb-10.2.24.orig/unittest/sql/CMakeLists.txt
+++ mariadb-10.2.24/unittest/sql/CMakeLists.txt
@@ -27,7 +27,7 @@ ELSE()
ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc)
ENDIF()

3
mariadb-10.2.23.tar.gz
View File

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

7
mariadb-10.2.23.tar.gz.sig
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iEYEABECAAYFAlyYMdYACgkQy8sIKhu5Q9slMwCfS/gJU5ACW0I38uf0fA/cJ2cs
mn0AoLY2uOaqqmu3euYQ6uFtj0QDsTNv
=q1/V
-----END PGP SIGNATURE-----

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:97f4d924e69f77abb2f650116785c2f5ef356230442534ebcbaadb51d9bb8bc4
size 71965656

7
mariadb-10.2.24.tar.gz.sig Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iEYEABECAAYFAlzTJE4ACgkQy8sIKhu5Q9tQDwCeKknxOY+mXMPmPEd3JopVIjwf
I70An3GunClhcxs/PeHN98pu/GBX8PHK
=rlBJ
-----END PGP SIGNATURE-----

66
mariadb.changes
View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Tue May 14 12:20:09 UTC 2019 - Kristýna Streitová <kstreitova@suse.com>
- update to 10.2.24 GA [bsc#1122198]
* notable changes:
* MDEV-18968 - Both (WHERE 0.1) and (WHERE NOT 0.1) return empty set
* MDEV-18466 - Unsafe to log updates on tables referenced by
foreign keys with triggers in statement format
* MDEV-18899 - Server crashes in Field::set_warning_truncated_wrong_value
* MDEV-18298 - Crashes server with segfault during role grants
* MDEV-17610 - Unexpected connection abort after certain operations
from within stored procedure
* MDEV-19112 - WITH clause does not work with information_schema
as default database
* MDEV-17830 - Server crashes in Item_null_result::field_type upon
SELECT with CHARSET(date) and ROLLUP
* MDEV-14041 - Server crashes in String::length on queries with
functions and ROLLUP
* MDEV-18920 - Prepared statements with st_convexhull hang and
eat 100% cpu.
* MDEV-15837 - Assertion item1->type() == Item::FIELD_ITEM &&
item2->type() == Item::FIELD_ITEM
* MDEV-9531 - GROUP_CONCAT with ORDER BY inside takes a lot of
memory while it's executed
* MDEV-17036 - BULK with replace doesn't take the first parameter
in account
* Bug#28986737 - RENAMING AND REPLACING MYSQL.USER TABLE CAN
LEAD TO A SERVER CRASH
* MDEV-19350 - Server crashes in delete_tree_element / ... /
Item_func_group_concat::repack_tree
* MDEV-19188 - Server Crash When Using a Trigger With A Number
of Virtual Columns on INSERT/UPDATE
* MDEV-19352 - Server crash in alloc_histograms_for_table_share
upon query from information schema InnoDB
* InnoDB persistent corruption fixes: MDEV-19426, MDEV-19022,
MDEV-19241, MDEV-13942
* InnoDB recovery fixes and speedup: MDEV-18733, MDEV-12699,
MDEV-19356, MDEV-19426
* MDEV-14398 - innodb_encrypt_tables will work even with
innodb_encryption_rotate_key_age=0
* MDEV-17036 - BULK with replace doesn't take the first
parameter in account
* MDEV-14784 - Slave crashes in show_status_array upon running
a trigger with select from I_S
* MDEV-19060 - mariabackup continues, despite failing to open
a tablespace
* MDEV-18686 - Add option to PAM authentication plugin to allow
case insensitive username matching
* bugfix - multi-update checked privileges on views incorrectly
* MDEV-19276 - during connect, write error log warning for
ER_DBACCESS_DENIED_ERROR, if log_warnings > 1
* MDEV-17456 - Malicious SUPER user can possibly change audit
log configuration without leaving traces.
* fixes for the following security vulnerabilities:
[CVE-2019-2614], [CVE-2019-2627], [CVE-2019-2628]
* release notes and changelog:
https://mariadb.com/kb/en/library/mariadb-10224-release-notes
https://mariadb.com/kb/en/library/mariadb-10224-changelog
- refresh mariadb-10.2.19-link-and-enable-c++11-atomics.patch
-------------------------------------------------------------------
Tue Apr 2 12:00:15 UTC 2019 - Kristýna Streitová <kstreitova@suse.com>
- remove %{extra_provides} definition and Provides/Obsoletes where
it was used. It's just a remnant and it's no longer needed.
-------------------------------------------------------------------
Tue Mar 26 12:45:14 UTC 2019 - Kristýna Streitová <kstreitova@suse.com>

20
mariadb.spec
View File

@ -18,10 +18,6 @@
# libmysqld soname
%define soname 19
# Used in Provides/Obsoletes for mariadb, test, tools, bench and
# errormessages subpackages to ensure a smooth transition from SLE12
# to SLE15 [fate#323756]
%define extra_provides mariadb-102
# Set this to 1 to run regression test suite (it takes a long time)
%define run_testsuite 1
# Set this to 1 for testing purposes (run all regression tests but ignore
@ -49,7 +45,7 @@
%define with_mroonga 0
%endif
Name: mariadb
Version: 10.2.23
Version: 10.2.24
Release: 0
Summary: Server part of MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception
@ -145,10 +141,6 @@ Provides: mysql = %{version}
Obsoletes: mysql < %{version}
Provides: mysql-debug = %{version}
Obsoletes: mysql-debug < %{version}
Provides: %{extra_provides} = %{version}
Obsoletes: %{extra_provides} < %{version}
Provides: %{extra_provides}-debug-version = %{version}
Obsoletes: %{extra_provides}-debug-version < %{version}
%if 0%{?suse_version} < 1500
# Explicit requires of systemd is not needed anymore and
# creates a problem for containers
@ -211,8 +203,6 @@ Requires(pre): pwdutils
Conflicts: otherproviders(mysql-client)
Provides: mysql-client = %{version}
Obsoletes: mysql-client < %{version}
Provides: %{extra_provides}-client = %{version}
Obsoletes: %{extra_provides}-client < %{version}
%description client
This package contains the standard clients for MariaDB.
@ -243,8 +233,6 @@ needed for running MariaDB Galera Cluster.
Summary: The error messages files required by server, client and libmysqld
Group: System/Localization
BuildArch: noarch
Provides: %{extra_provides}-errormessages = %{version}
Obsoletes: %{extra_provides}-errormessages < %{version}
%description errormessages
This package provides translated error messages for the standalone
@ -258,8 +246,6 @@ Requires: perl-DBD-mysql
Conflicts: otherproviders(mysql-bench)
Provides: mysql-bench = %{version}
Obsoletes: mysql-bench < %{version}
Provides: %{extra_provides}-bench = %{version}
Obsoletes: %{extra_provides}-bench < %{version}
%description bench
This package contains benchmark scripts and data for MariaDB.
@ -294,8 +280,6 @@ Requires: perl(Time::HiRes)
Conflicts: otherproviders(mysql-test)
Provides: mysql-test = %{version}
Obsoletes: mysql-test < %{version}
Provides: %{extra_provides}-test = %{version}
Obsoletes: %{extra_provides}-test < %{version}
%description test
This package contains the test scripts and data for MariaDB.
@ -312,8 +296,6 @@ Provides: mysql-client:%{_bindir}/perror
Provides: mysql-tools = %{version}
Provides: mysql:%{_bindir}/mysqlhotcopy
Obsoletes: mysql-tools < %{version}
Provides: %{extra_provides}-tools = %{version}
Obsoletes: %{extra_provides}-tools < %{version}
%description tools
A set of scripts for administering a MariaDB or developing