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

Accepting request 879497 from server:database

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/879497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=108
This commit is contained in:
Richard Brown 2021-03-19 15:39:51 +00:00 committed by Git OBS Bridge
commit 34250d0008
8 changed files with 38 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
fix-lock-rollback-assert-abort.patch
View File

@ -1,83 +0,0 @@
commit 8e3e87d2fc1e63d287f203d441dcb9360775c6b7
Author: sjaakola <seppo.jaakola@iki.fi>
Date: Tue Dec 8 18:02:42 2020 +0200
MDEV-23851 MDEV-24229 BF-BF conflict issues
Issues MDEV-23851 and MDEV-24229 are probably duplicates and are caused by the new self-asserting function lock0lock.cc:wsrep_assert_no_bf_bf_wait().
The criteria for asserting is too strict and does not take in consideration scenarios of "false positive" lock conflicts, which are resolved by replaying the local transaction.
As a fix, this PR is relaxing the assert criteria by two conditions, which skip assert if high priority transactions are locking in correct order or if conflicting high priority lock holder is aborting and has just not yet released the lock.
Alternative fix would be to remove wsrep_assert_no_bf_bf_wait() altogether, or remove the assert in this function and let it only print warnings in error log.
But in my high conflict rate multi-master test scenario, this relaxed asserting appears to be safe.
This PR also removes two wsrep_report_bf_lock_wait() calls in innodb lock manager, which cause mutex access assert in debug builds.
Foreign key appending missed handling of data types of float and double in INSERT execution. This is not directly related to the actual issue here but is fixed in this PR nevertheless. Missing these foreign keys values in certification could cause problems in some multi-master load scenarios.
Finally, some problem reports suggest that some of the issues reported in MDEV-23851 might relate to false positive lock conflicts over unique secondary index gaps. There is separate work for relaxing UK index gap locking of replication appliers, and separate PR will be submitted for it, with a related mtr test as well.
Index: mariadb-10.5.8/storage/innobase/lock/lock0lock.cc
===================================================================
--- mariadb-10.5.8.orig/storage/innobase/lock/lock0lock.cc
+++ mariadb-10.5.8/storage/innobase/lock/lock0lock.cc
@@ -627,6 +627,20 @@ static void wsrep_assert_no_bf_bf_wait(
if (UNIV_LIKELY(!wsrep_thd_is_BF(lock_rec2->trx->mysql_thd, FALSE)))
return;
+ /* if BF - BF order is honored, we can keep trx1 waiting for the lock */
+ if (wsrep_thd_order_before(trx1->mysql_thd, lock_rec2->trx->mysql_thd))
+ return;
+
+ /* avoiding BF-BF conflict assert, if victim is already aborting
+ or rolling back for replaying
+ */
+ wsrep_thd_LOCK(lock_rec2->trx->mysql_thd);
+ if (wsrep_thd_is_aborting(lock_rec2->trx->mysql_thd)) {
+ wsrep_thd_UNLOCK(lock_rec2->trx->mysql_thd);
+ return;
+ }
+ wsrep_thd_UNLOCK(lock_rec2->trx->mysql_thd);
+
mtr_t mtr;
if (lock_rec1) {
@@ -1385,11 +1399,6 @@ lock_rec_create_low(
trx_mutex_exit(c_lock->trx);
- if (UNIV_UNLIKELY(wsrep_debug)) {
- wsrep_report_bf_lock_wait(trx->mysql_thd, trx->id);
- wsrep_report_bf_lock_wait(c_lock->trx->mysql_thd, c_lock->trx->id);
- }
-
/* have to bail out here to avoid lock_set_lock... */
return(lock);
}
Index: mariadb-10.5.8/storage/innobase/rem/rem0rec.cc
===================================================================
--- mariadb-10.5.8.orig/storage/innobase/rem/rem0rec.cc
+++ mariadb-10.5.8/storage/innobase/rem/rem0rec.cc
@@ -2735,8 +2735,22 @@ wsrep_rec_get_foreign_key(
break;
case DATA_BLOB:
case DATA_BINARY:
+ case DATA_FIXBINARY:
+ case DATA_GEOMETRY:
memcpy(buf, data, len);
break;
+ case DATA_FLOAT:
+ {
+ float f = mach_float_read(data);
+ memcpy(buf, &f, sizeof(float));
+ }
+ break;
+ case DATA_DOUBLE:
+ {
+ double d = mach_double_read(data);
+ memcpy(buf, &d, sizeof(double));
+ }
+ break;
default:
break;
}

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

@ -7,11 +7,11 @@ Date: Fri Dec 21 19:14:04 2018 +0200
atomic operations. Check first if support is available without atomic operations. Check first if support is available without
linking, otherwise use the library. linking, otherwise use the library.
Index: mariadb-10.5.8/configure.cmake Index: mariadb-10.5.9/configure.cmake
=================================================================== ===================================================================
--- mariadb-10.5.8.orig/configure.cmake --- mariadb-10.5.9.orig/configure.cmake
+++ mariadb-10.5.8/configure.cmake +++ mariadb-10.5.9/configure.cmake
@@ -861,7 +861,25 @@ int main() @@ -862,7 +862,25 @@ int main()
long long int *ptr= &var; long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}" }"
@ -38,11 +38,11 @@ Index: mariadb-10.5.8/configure.cmake
IF(WITH_VALGRIND) IF(WITH_VALGRIND)
SET(HAVE_valgrind 1) SET(HAVE_valgrind 1)
Index: mariadb-10.5.8/mysys/CMakeLists.txt Index: mariadb-10.5.9/mysys/CMakeLists.txt
=================================================================== ===================================================================
--- mariadb-10.5.8.orig/mysys/CMakeLists.txt --- mariadb-10.5.9.orig/mysys/CMakeLists.txt
+++ mariadb-10.5.8/mysys/CMakeLists.txt +++ mariadb-10.5.9/mysys/CMakeLists.txt
@@ -140,6 +140,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings @@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
DTRACE_INSTRUMENT(mysys) DTRACE_INSTRUMENT(mysys)
@ -53,11 +53,11 @@ Index: mariadb-10.5.8/mysys/CMakeLists.txt
IF(HAVE_BFD_H) IF(HAVE_BFD_H)
TARGET_LINK_LIBRARIES(mysys bfd) TARGET_LINK_LIBRARIES(mysys bfd)
ENDIF(HAVE_BFD_H) ENDIF(HAVE_BFD_H)
Index: mariadb-10.5.8/sql/CMakeLists.txt Index: mariadb-10.5.9/sql/CMakeLists.txt
=================================================================== ===================================================================
--- mariadb-10.5.8.orig/sql/CMakeLists.txt --- mariadb-10.5.9.orig/sql/CMakeLists.txt
+++ mariadb-10.5.8/sql/CMakeLists.txt +++ mariadb-10.5.9/sql/CMakeLists.txt
@@ -215,6 +215,10 @@ ELSE() @@ -222,6 +222,10 @@ ELSE()
SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL})
ENDIF() ENDIF()
@ -65,6 +65,6 @@ Index: mariadb-10.5.8/sql/CMakeLists.txt
+ TARGET_LINK_LIBRARIES(sql atomic) + TARGET_LINK_LIBRARIES(sql atomic)
+ENDIF() +ENDIF()
+ +
IF(MSVC) IF(MSVC OR CMAKE_SYSTEM_NAME MATCHES AIX)
SET(libs_to_export_symbols sql mysys dbug strings) SET(libs_to_export_symbols sql mysys dbug strings)
# Create shared library of already compiled object # Create shared library of already compiled object

3
mariadb-10.5.8.tar.gz
View File

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

6
mariadb-10.5.8.tar.gz.sig
View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCX6s7dQAKCRDLywgqG7lD
27aMAKCAdX+NC/VksUO9bk5zjiaPLVdZzwCfTrccWCS7uAGMk2fLbFMLb4DSQ20=
=hJl1
-----END PGP SIGNATURE-----

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

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

6
mariadb-10.5.9.tar.gz.sig Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCYDAyFgAKCRDLywgqG7lD
2wrXAJ4vsH4IiLiLTiF4fwE0qcHZL4joLgCffboEebE3ibxCXu+9Zp03n+LHVpk=
=I2yi
-----END PGP SIGNATURE-----

15
mariadb.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Mar 12 22:07:53 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
- Update to 10.5.9
* release notes and changelog:
https://mariadb.com/kb/en/library/mariadb-1059-release-notes
https://mariadb.com/kb/en/library/mariadb-1059-changelog
* fixes for the following security vulnerabilities:
10.5.9: none
- Tracker bug: [bsc#1182739]
- Update fixes [bsc#1182255] (MDL BF-BF Conflict caused by
TRUNCATE TABLE)
- refresh mariadb-10.2.19-link-and-enable-c++11-atomics.patch
- remove fix-lock-rollback-assert-abort.patch (applied upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 15 18:49:43 UTC 2021 - Kristyna Streitova <kstreitova@suse.com> Mon Feb 15 18:49:43 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>

4
mariadb.spec
View File

@ -56,7 +56,7 @@
# Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
%define with_cracklib_plugin 0 %define with_cracklib_plugin 0
Name: mariadb Name: mariadb
Version: 10.5.8 Version: 10.5.9
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
@ -85,7 +85,6 @@ Patch4: mariadb-10.2.4-fortify-and-O.patch
Patch5: mariadb-10.2.19-link-and-enable-c++11-atomics.patch Patch5: mariadb-10.2.19-link-and-enable-c++11-atomics.patch
Patch6: mariadb-10.4.12-harden_setuid.patch Patch6: mariadb-10.4.12-harden_setuid.patch
Patch7: mariadb-10.4.12-fix-install-db.patch Patch7: mariadb-10.4.12-fix-install-db.patch
Patch8: fix-lock-rollback-assert-abort.patch
# needed for bison SQL parser and wsrep API # needed for bison SQL parser and wsrep API
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake BuildRequires: cmake
@ -374,7 +373,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
cp %{_sourcedir}/suse-test-run . cp %{_sourcedir}/suse-test-run .