[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/
commit: a49c1f6a0904025e1e1d60ed0aac0821cb5a931c
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Aug 28 19:46:41 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Aug 29 07:48:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49c1f6a
dev-db/mariadb: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32496
Signed-off-by: Conrad Kostecki gentoo.org>
dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch | 23 ---
.../files/mariadb-10.6.11-configure-clang16.patch | 26 --
2 files changed, 49 deletions(-)
diff --git a/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
b/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
deleted file mode 100644
index c474028e7e06..
--- a/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/895698
-https://github.com/MariaDB/server/commit/75bbf645a66db797be2abd3a348dce32eb753acc
-
-From 75bbf645a66db797be2abd3a348dce32eb753acc Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Tue, 24 Jan 2023 21:40:43 -0800
-Subject: [PATCH] Add missing include
-
-This is needed with GCC 13 and newer [1]
-
-[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
-
-Signed-off-by: Khem Raj
a/tpool/aio_linux.cc
-+++ b/tpool/aio_linux.cc
-@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02111 - 1301 USA*/
- #ifdef LINUX_NATIVE_AIO
- # include
- # include
-+# include
- # include
- # include
-
diff --git a/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
b/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
deleted file mode 100644
index cc97319f4bc1..
--- a/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/MariaDB/server/pull/2593
-
-From 50c034d6de4fa508186cb8f75cb6073f5d0ced2f Mon Sep 17 00:00:00 2001
-From: Florian Weimer
-Date: Tue, 11 Apr 2023 09:39:40 +0200
-Subject: [PATCH] rocksdb: Define _GNU_SOURCE during fallocate CMake probe
-
-The glibc headers declare fallocate only if _GNU_SOURCE is defined.
-Without this change, the probe fails with C compilers which do not
-support implicit function declarations even if the system does in
-fact support the fallocate function.
-
-Upstream rocksdb does not need this because the probe is run with the
-C++ compiler, and current g++ versions define _GNU_SOURCE
-automatically.
a/storage/rocksdb/build_rocksdb.cmake
-+++ b/storage/rocksdb/build_rocksdb.cmake
-@@ -134,6 +134,7 @@ option(WITH_FALLOCATE "build with fallocate" ON)
- if(WITH_FALLOCATE AND UNIX)
- include(CheckCSourceCompiles)
- CHECK_C_SOURCE_COMPILES("
-+#define _GNU_SOURCE
- #include
- #include
- int main() {
-
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/
commit: e7366c7358e43e26c1558324b252620c4cdc0dfb
Author: Sam James gentoo org>
AuthorDate: Fri Apr 14 03:55:24 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 14 03:59:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7366c73
dev-db/mariadb: fix configure w/ clang 16
Bug: https://bugs.gentoo.org/899772
Signed-off-by: Sam James gentoo.org>
.../files/mariadb-10.6.11-configure-clang16.patch | 26 ++
...10.6.11-r3.ebuild => mariadb-10.6.11-r4.ebuild} | 7 ++
dev-db/mariadb/mariadb-10.6.12-r1.ebuild | 7 ++
3 files changed, 40 insertions(+)
diff --git a/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
b/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
new file mode 100644
index ..cc97319f4bc1
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
@@ -0,0 +1,26 @@
+https://github.com/MariaDB/server/pull/2593
+
+From 50c034d6de4fa508186cb8f75cb6073f5d0ced2f Mon Sep 17 00:00:00 2001
+From: Florian Weimer
+Date: Tue, 11 Apr 2023 09:39:40 +0200
+Subject: [PATCH] rocksdb: Define _GNU_SOURCE during fallocate CMake probe
+
+The glibc headers declare fallocate only if _GNU_SOURCE is defined.
+Without this change, the probe fails with C compilers which do not
+support implicit function declarations even if the system does in
+fact support the fallocate function.
+
+Upstream rocksdb does not need this because the probe is run with the
+C++ compiler, and current g++ versions define _GNU_SOURCE
+automatically.
+--- a/storage/rocksdb/build_rocksdb.cmake
b/storage/rocksdb/build_rocksdb.cmake
+@@ -134,6 +134,7 @@ option(WITH_FALLOCATE "build with fallocate" ON)
+ if(WITH_FALLOCATE AND UNIX)
+ include(CheckCSourceCompiles)
+ CHECK_C_SOURCE_COMPILES("
++#define _GNU_SOURCE
+ #include
+ #include
+ int main() {
+
diff --git a/dev-db/mariadb/mariadb-10.6.11-r3.ebuild
b/dev-db/mariadb/mariadb-10.6.11-r4.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.6.11-r3.ebuild
rename to dev-db/mariadb/mariadb-10.6.11-r4.ebuild
index 10e0da46a123..a9cf9c365dc7 100644
--- a/dev-db/mariadb/mariadb-10.6.11-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11-r4.ebuild
@@ -128,6 +128,12 @@ RDEPEND="${COMMON_DEPEND}
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # These don't exist on Linux
+ pthread_threadid_np
+ getthrid
+)
+
mysql_init_vars() {
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
@@ -211,6 +217,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
eapply "${FILESDIR}"/${PN}-10.6.11-gcc-13.patch
+ eapply "${FILESDIR}"/${PN}-10.6.11-configure-clang16.patch
eapply_user
diff --git a/dev-db/mariadb/mariadb-10.6.12-r1.ebuild
b/dev-db/mariadb/mariadb-10.6.12-r1.ebuild
index a79aca4cedf2..9fe113c8b843 100644
--- a/dev-db/mariadb/mariadb-10.6.12-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.12-r1.ebuild
@@ -129,6 +129,12 @@ RDEPEND="${COMMON_DEPEND}
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # These don't exist on Linux
+ pthread_threadid_np
+ getthrid
+)
+
mysql_init_vars() {
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
@@ -212,6 +218,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch
+ eapply "${FILESDIR}"/${PN}-10.6.11-configure-clang16.patch
eapply_user
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/
commit: 50b83818fc631bcf04a38aee7d42c57703e10d72
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Wed Dec 21 17:44:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 24 07:14:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b83818
dev-db/mariadb: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28736
Signed-off-by: Sam James gentoo.org>
dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch | 461 -
1 file changed, 461 deletions(-)
diff --git a/dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch
b/dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch
deleted file mode 100644
index 378ae6bae082..
--- a/dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-https://bugs.gentoo.org/849593
-https://github.com/MariaDB/server/commit/f0fa40efada3f46d76b735fa61e9f20cc9ce18fc
-https://github.com/MariaDB/server/commit/987d16a0b43c163264ab37d3e01795577f97d83b
-https://github.com/MariaDB/server/commit/78412ab028509f07a801c9bf1f3792ad77bcfac6
-https://github.com/MariaDB/server/commit/babb803222d4a5d5a3256720c59d056cc8ba7dc3
-
-From: Vladislav Vaintroub
-Date: Mon, 8 Nov 2021 18:48:19 +0100
-Subject: [PATCH] MDEV-25785 Add support for OpenSSL 3.0
-
-Summary of changes
-
-- MD_CTX_SIZE is increased
-
-- EVP_CIPHER_CTX_buf_noconst(ctx) does not work anymore, points
- to nobody knows where. The assumption made previously was that
- (since the function does not seem to be documented)
- was that it points to the last partial source block.
- Add own partial block buffer for NOPAD encryption instead
-
-- SECLEVEL in CipherString in openssl.cnf
- had been downgraded to 0, from 1, to make TLSv1.0 and TLSv1.1 possible
- (according to https://github.com/openssl/openssl/blob/openssl-3.0.0/NEWS.md
- even though the manual for SSL_CTX_get_security_level claims that it
- should not be necessary)
-
-- Workaround Ssl_cipher_list issue, it now returns TLSv1.3 ciphers,
- in addition to what was set in --ssl-cipher
-
-- ctx_buf buffer now must be aligned to 16 bytes with openssl(
- previously with WolfSSL only), ot crashes will happen
-
-- updated aes-t , to be better debuggable
- using function, rather than a huge multiline macro
- added test that does "nopad" encryption piece-wise, to test
- replacement of EVP_CIPHER_CTX_buf_noconst
-
-part of MDEV-28133
a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -139,6 +139,13 @@ MACRO (MYSQL_CHECK_SSL)
- SET(SSL_INTERNAL_INCLUDE_DIRS "")
- SET(SSL_DEFINES "-DHAVE_OPENSSL")
-
-+ # Silence "deprecated in OpenSSL 3.0"
-+ IF((NOT OPENSSL_VERSION) # 3.0 not determined by older cmake
-+ OR NOT(OPENSSL_VERSION VERSION_LESS "3.0.0"))
-+SET(SSL_DEFINES "${SSL_DEFINES} -DOPENSSL_API_COMPAT=0x1010L")
-+SET(CMAKE_REQUIRED_DEFINITIONS -DOPENSSL_API_COMPAT=0x1010L)
-+ ENDIF()
-+
- SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
- SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES})
- SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-@@ -152,6 +159,7 @@ MACRO (MYSQL_CHECK_SSL)
- HAVE_X509_check_host)
- SET(CMAKE_REQUIRED_INCLUDES)
- SET(CMAKE_REQUIRED_LIBRARIES)
-+ SET(CMAKE_REQUIRED_DEFINITIONS)
- ELSE()
- IF(WITH_SSL STREQUAL "system")
- MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for
SSL. Use WITH_SSL=bundled to enable SSL support")
a/include/mysql/service_my_crypt.h
-+++ b/include/mysql/service_my_crypt.h
-@@ -45,7 +45,7 @@ extern "C" {
- /* The max key length of all supported algorithms */
- #define MY_AES_MAX_KEY_LENGTH 32
-
--#define MY_AES_CTX_SIZE 656
-+#define MY_AES_CTX_SIZE 672
-
- enum my_aes_mode {
- MY_AES_ECB, MY_AES_CBC
a/include/ssl_compat.h
-+++ b/include/ssl_compat.h
-@@ -24,7 +24,7 @@
- #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
- #define ERR_remove_state(X) ERR_clear_error()
- #define EVP_CIPHER_CTX_SIZE 176
--#define EVP_MD_CTX_SIZE 48
-+#define EVP_MD_CTX_SIZE 72
- #undef EVP_MD_CTX_init
- #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE);
EVP_MD_CTX_reset(X); } while(0)
- #undef EVP_CIPHER_CTX_init
-@@ -77,7 +77,6 @@
- #define DH_set0_pqg(D,P,Q,G)((D)->p= (P), (D)->g= (G))
- #endif
-
--#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
- #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt)
- #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX)
-
a/mysql-test/lib/openssl.cnf
-+++ b/mysql-test/lib/openssl.cnf
-@@ -9,4 +9,4 @@ ssl_conf = ssl_section
- system_default = system_default_section
-
- [system_default_section]
--CipherString = ALL:@SECLEVEL=1
-+CipherString = ALL:@SECLEVEL=0
a/mysql-test/main/ssl_cipher.result
-+++ b/mysql-test/main/ssl_cipher.result
-@@ -61,8 +61,8 @@ connect ssl_con,localhost,root,SSL;
- SHOW STATUS LIKE
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/
commit: f8a6c534218755943cb627f0ccb960947851b060
Author: Sam James gentoo org>
AuthorDate: Mon Jun 6 00:36:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jun 6 00:36:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a6c534
dev-db/mariadb: apply upstream 10.6.x OpenSSL 3 patches (to 10.6.8-r1)
These are already queued on the upstream 10.6.x branch. Having a version
of MariaDB that's OpenSSL 3 capable is important given it unblocks
other packages and more wide testing.
(Also, while this isn't what we're doing, Fedora has been using
a bunch of OpenSSL 3 patches on top of 10.5.x for a while.)
Closes: https://bugs.gentoo.org/849593
Signed-off-by: Sam James gentoo.org>
dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch | 461 +++
dev-db/mariadb/mariadb-10.6.8-r1.ebuild| 1318
2 files changed, 1779 insertions(+)
diff --git a/dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch
b/dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch
new file mode 100644
index ..378ae6bae082
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.8-openssl3.patch
@@ -0,0 +1,461 @@
+https://bugs.gentoo.org/849593
+https://github.com/MariaDB/server/commit/f0fa40efada3f46d76b735fa61e9f20cc9ce18fc
+https://github.com/MariaDB/server/commit/987d16a0b43c163264ab37d3e01795577f97d83b
+https://github.com/MariaDB/server/commit/78412ab028509f07a801c9bf1f3792ad77bcfac6
+https://github.com/MariaDB/server/commit/babb803222d4a5d5a3256720c59d056cc8ba7dc3
+
+From: Vladislav Vaintroub
+Date: Mon, 8 Nov 2021 18:48:19 +0100
+Subject: [PATCH] MDEV-25785 Add support for OpenSSL 3.0
+
+Summary of changes
+
+- MD_CTX_SIZE is increased
+
+- EVP_CIPHER_CTX_buf_noconst(ctx) does not work anymore, points
+ to nobody knows where. The assumption made previously was that
+ (since the function does not seem to be documented)
+ was that it points to the last partial source block.
+ Add own partial block buffer for NOPAD encryption instead
+
+- SECLEVEL in CipherString in openssl.cnf
+ had been downgraded to 0, from 1, to make TLSv1.0 and TLSv1.1 possible
+ (according to https://github.com/openssl/openssl/blob/openssl-3.0.0/NEWS.md
+ even though the manual for SSL_CTX_get_security_level claims that it
+ should not be necessary)
+
+- Workaround Ssl_cipher_list issue, it now returns TLSv1.3 ciphers,
+ in addition to what was set in --ssl-cipher
+
+- ctx_buf buffer now must be aligned to 16 bytes with openssl(
+ previously with WolfSSL only), ot crashes will happen
+
+- updated aes-t , to be better debuggable
+ using function, rather than a huge multiline macro
+ added test that does "nopad" encryption piece-wise, to test
+ replacement of EVP_CIPHER_CTX_buf_noconst
+
+part of MDEV-28133
+--- a/cmake/ssl.cmake
b/cmake/ssl.cmake
+@@ -139,6 +139,13 @@ MACRO (MYSQL_CHECK_SSL)
+ SET(SSL_INTERNAL_INCLUDE_DIRS "")
+ SET(SSL_DEFINES "-DHAVE_OPENSSL")
+
++ # Silence "deprecated in OpenSSL 3.0"
++ IF((NOT OPENSSL_VERSION) # 3.0 not determined by older cmake
++ OR NOT(OPENSSL_VERSION VERSION_LESS "3.0.0"))
++SET(SSL_DEFINES "${SSL_DEFINES} -DOPENSSL_API_COMPAT=0x1010L")
++SET(CMAKE_REQUIRED_DEFINITIONS -DOPENSSL_API_COMPAT=0x1010L)
++ ENDIF()
++
+ SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+ SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES})
+ SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+@@ -152,6 +159,7 @@ MACRO (MYSQL_CHECK_SSL)
+ HAVE_X509_check_host)
+ SET(CMAKE_REQUIRED_INCLUDES)
+ SET(CMAKE_REQUIRED_LIBRARIES)
++ SET(CMAKE_REQUIRED_DEFINITIONS)
+ ELSE()
+ IF(WITH_SSL STREQUAL "system")
+ MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for
SSL. Use WITH_SSL=bundled to enable SSL support")
+--- a/include/mysql/service_my_crypt.h
b/include/mysql/service_my_crypt.h
+@@ -45,7 +45,7 @@ extern "C" {
+ /* The max key length of all supported algorithms */
+ #define MY_AES_MAX_KEY_LENGTH 32
+
+-#define MY_AES_CTX_SIZE 656
++#define MY_AES_CTX_SIZE 672
+
+ enum my_aes_mode {
+ MY_AES_ECB, MY_AES_CBC
+--- a/include/ssl_compat.h
b/include/ssl_compat.h
+@@ -24,7 +24,7 @@
+ #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
+ #define ERR_remove_state(X) ERR_clear_error()
+ #define EVP_CIPHER_CTX_SIZE 176
+-#define EVP_MD_CTX_SIZE 48
++#define EVP_MD_CTX_SIZE 72
+ #undef EVP_MD_CTX_init
+ #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE);
EVP_MD_CTX_reset(X); } while(0)
+ #undef EVP_CIPHER_CTX_init
+@@ -77,7 +77,6 @@
+ #define DH_set0_pqg(D,P,Q,G)((D)->p= (P), (D)->g= (G))
+ #endif
+
+-#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
+ #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt)
+ #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX)
+
+--- a/mysql-test/lib/openssl.cnf
b/mysql-test/lib/openssl.cnf
+@@ -9,4 +9,4 @@
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/
commit: 19e6c92263dda4f0892354b05d58a064cd0db7f6
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri Aug 20 18:27:09 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Aug 27 23:38:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e6c922
dev-db/mariadb: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/22057
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/mariadb-10.3-CVE-2020-15180.patch| 75 --
.../files/mariadb-10.4-CVE-2020-15180.patch| 62 --
2 files changed, 137 deletions(-)
diff --git a/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
b/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
deleted file mode 100644
index 85d378f8232..000
--- a/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842
-
a/sql/wsrep_sst.cc
-+++ b/sql/wsrep_sst.cc
-@@ -1726,24 +1726,65 @@ static int sst_donate_other (const char* method,
- return arg.err;
- }
-
-+/* return true if character can be a part of a filename */
-+static bool filename_char(int const c)
-+{
-+ return isalnum(c) || (c == '-') || (c == '_') || (c == '.');
-+}
-+
-+/* return true if character can be a part of an address string */
-+static bool address_char(int const c)
-+{
-+ return filename_char(c) ||
-+ (c == ':') || (c == '[') || (c == ']') || (c == '/');
-+}
-+
-+static bool check_request_str(const char* const str,
-+ bool (*check) (int c))
-+{
-+ for (size_t i(0); str[i] != '\0'; ++i)
-+ {
-+if (!check(str[i]))
-+{
-+ WSREP_WARN("Illegal character in state transfer request: %i (%c).",
-+ str[i], str[i]);
-+ return true;
-+}
-+ }
-+
-+ return false;
-+}
-+
- wsrep_cb_status_t wsrep_sst_donate_cb (void* app_ctx, void* recv_ctx,
-const void* msg, size_t msg_len,
-const wsrep_gtid_t* current_gtid,
-const char* state, size_t state_len,
-bool bypass)
- {
-- /* This will be reset when sync callback is called.
-- * Should we set wsrep_ready to FALSE here too? */
--
-- wsrep_config_state->set(WSREP_MEMBER_DONOR);
--
- const char* method = (char*)msg;
- size_t method_len = strlen (method);
-+
-+ if (check_request_str(method, filename_char))
-+ {
-+WSREP_ERROR("Bad SST method name. SST canceled.");
-+return WSREP_CB_FAILURE;
-+ }
-+
- const char* data = method + method_len + 1;
-
-+ if (check_request_str(data, address_char))
-+ {
-+WSREP_ERROR("Bad SST address string. SST canceled.");
-+return WSREP_CB_FAILURE;
-+ }
-+
- char uuid_str[37];
- wsrep_uuid_print (_gtid->uuid, uuid_str, sizeof(uuid_str));
-
-+ /* This will be reset when sync callback is called.
-+ * Should we set wsrep_ready to FALSE here too? */
-+ wsrep_config_state->set(WSREP_MEMBER_DONOR);
-+
- wsp::env env(NULL);
- if (env.error())
- {
diff --git a/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch
b/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch
deleted file mode 100644
index 9658669c6e6..000
--- a/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842
-
a/sql/wsrep_sst.cc
-+++ b/sql/wsrep_sst.cc
-@@ -1822,6 +1822,35 @@ static int sst_donate_other (const char*method,
- return arg.err;
- }
-
-+/* return true if character can be a part of a filename */
-+static bool filename_char(int const c)
-+{
-+ return isalnum(c) || (c == '-') || (c == '_') || (c == '.');
-+}
-+
-+/* return true if character can be a part of an address string */
-+static bool address_char(int const c)
-+{
-+ return filename_char(c) ||
-+ (c == ':') || (c == '[') || (c == ']') || (c == '/');
-+}
-+
-+static bool check_request_str(const char* const str,
-+ bool (*check) (int c))
-+{
-+ for (size_t i(0); str[i] != '\0'; ++i)
-+ {
-+if (!check(str[i]))
-+{
-+ WSREP_WARN("Illegal character in state transfer request: %i (%c).",
-+ str[i], str[i]);
-+ return true;
-+}
-+ }
-+
-+ return false;
-+}
-+
- int wsrep_sst_donate(const std::string& msg,
- const wsrep::gtid& current_gtid,
- const bool bypass)
-@@ -1833,8 +1862,21 @@ int wsrep_sst_donate(const std::string& msg,
-
- const char* method= msg.data();
- size_t method_len= strlen (method);
-+
-+ if (check_request_str(method, filename_char))
-+ {
-+WSREP_ERROR("Bad SST method name. SST canceled.");
-+return
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/
commit: 0f20dcf0f023c32af2dfe4994d3bc9aef11e61d4
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Oct 7 22:16:25 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Oct 7 22:30:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f20dcf0
dev-db/mariadb: 10.3.x rev bump for CVE-2020-15180
Bug: https://bugs.gentoo.org/747166
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann gentoo.org>
.../files/mariadb-10.3-CVE-2020-15180.patch| 75 ++
...10.3.23-r2.ebuild => mariadb-10.3.23-r3.ebuild} | 1 +
2 files changed, 76 insertions(+)
diff --git a/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
b/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
new file mode 100644
index 000..85d378f8232
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch
@@ -0,0 +1,75 @@
+https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842
+
+--- a/sql/wsrep_sst.cc
b/sql/wsrep_sst.cc
+@@ -1726,24 +1726,65 @@ static int sst_donate_other (const char* method,
+ return arg.err;
+ }
+
++/* return true if character can be a part of a filename */
++static bool filename_char(int const c)
++{
++ return isalnum(c) || (c == '-') || (c == '_') || (c == '.');
++}
++
++/* return true if character can be a part of an address string */
++static bool address_char(int const c)
++{
++ return filename_char(c) ||
++ (c == ':') || (c == '[') || (c == ']') || (c == '/');
++}
++
++static bool check_request_str(const char* const str,
++ bool (*check) (int c))
++{
++ for (size_t i(0); str[i] != '\0'; ++i)
++ {
++if (!check(str[i]))
++{
++ WSREP_WARN("Illegal character in state transfer request: %i (%c).",
++ str[i], str[i]);
++ return true;
++}
++ }
++
++ return false;
++}
++
+ wsrep_cb_status_t wsrep_sst_donate_cb (void* app_ctx, void* recv_ctx,
+const void* msg, size_t msg_len,
+const wsrep_gtid_t* current_gtid,
+const char* state, size_t state_len,
+bool bypass)
+ {
+- /* This will be reset when sync callback is called.
+- * Should we set wsrep_ready to FALSE here too? */
+-
+- wsrep_config_state->set(WSREP_MEMBER_DONOR);
+-
+ const char* method = (char*)msg;
+ size_t method_len = strlen (method);
++
++ if (check_request_str(method, filename_char))
++ {
++WSREP_ERROR("Bad SST method name. SST canceled.");
++return WSREP_CB_FAILURE;
++ }
++
+ const char* data = method + method_len + 1;
+
++ if (check_request_str(data, address_char))
++ {
++WSREP_ERROR("Bad SST address string. SST canceled.");
++return WSREP_CB_FAILURE;
++ }
++
+ char uuid_str[37];
+ wsrep_uuid_print (_gtid->uuid, uuid_str, sizeof(uuid_str));
+
++ /* This will be reset when sync callback is called.
++ * Should we set wsrep_ready to FALSE here too? */
++ wsrep_config_state->set(WSREP_MEMBER_DONOR);
++
+ wsp::env env(NULL);
+ if (env.error())
+ {
diff --git a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild
b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.3.23-r2.ebuild
rename to dev-db/mariadb/mariadb-10.3.23-r3.ebuild
index 815d86f66db..fdadccc6415 100644
--- a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
@@ -238,6 +238,7 @@ src_unpack() {
src_prepare() {
eapply "${WORKDIR}"/mariadb-patches
+ eapply "${FILESDIR}"/mariadb-10.3-CVE-2020-15180.patch
eapply_user
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/
commit: e71231e36dc2daf85584b930da13f062b00d2e38 Author: Brian Evans gentoo org> AuthorDate: Tue Nov 12 14:11:04 2019 + Commit: Brian Evans gentoo org> CommitDate: Tue Nov 12 14:11:04 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71231e3 dev-db/mariadb: Fix references to character sets in 5.5 Closes: https://bugs.gentoo.org/692482 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/files/my.cnf-5.5 | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5 index dec0c4cb8ee..289af8a24d0 100644 --- a/dev-db/mariadb/files/my.cnf-5.5 +++ b/dev-db/mariadb/files/my.cnf-5.5 @@ -7,34 +7,34 @@ port = 3306 socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock [mysql] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqladmin] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqlcheck] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqldump] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqlimport] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqlshow] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [myisamchk] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets [myisampack] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets # use [safe_mysqld] with mysql-3 [mysqld_safe] @@ -59,7 +59,7 @@ net_buffer_length = 8K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size= 8M -lc_messages_dir= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql +lc_messages_dir= @GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb #Set this to your desired error message language lc_messages= en_US
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/
commit: 7d72270ea9bda5054790247fa85392e3b2fd105f Author: Brian Evans gentoo org> AuthorDate: Fri Nov 8 19:58:09 2019 + Commit: Brian Evans gentoo org> CommitDate: Fri Nov 8 19:58:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d72270e dev-db/mariadb: Version bump for 10.2.29 Upstream recommends immediate removal of 10.2.28 Despite the fact that it was published with the patch 10.2.29 fixed, this comforts users. Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/Manifest| 2 +- dev-db/mariadb/files/MDEV-20987-fulltext.patch | 185 - ...riadb-10.2.28.ebuild => mariadb-10.2.29.ebuild} | 1 - 3 files changed, 1 insertion(+), 187 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 7958d696b60..2b4d7cf7034 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -3,7 +3,7 @@ DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 91ebc6d24c80ad9651c42a2f4553ce3ec3b DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c SHA512 1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124 DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 7e4ae229040b3136ad107979864bc391556c1ba83847addd89e09f3757cd01203503e07832abe496a7f560048ed704f273607da3a114afa59ceb13cbb3b89c14 SHA512 9ea7ea30f964d022d16c662c18ac40ea50ef5b6592d02ba739ad81f9dfa9e60be90ea6d4706b43b07402c4cbc8c0280633b6e21bda6daf5bbc1d3c540993e4d6 -DIST mariadb-10.2.28.tar.gz 73078014 BLAKE2B cd1f11c35538590f0e864d1ab4696e1eaa3e239fc9760e00c3ad09aa054bb58f425931516e2ec2ef88869ab79039a95aec14d28e430e9a14169ec7d305ea SHA512 4fdad47cdbe0643c8a9d40210aef0c135ee42b1696f6b9903e155522c8481f284d14dd96b21f06eb64f7b0dbb7591844109a03a2836cfb8a187b7aac8037c815 +DIST mariadb-10.2.29.tar.gz 73087972 BLAKE2B aa3fe880f00b02846b26f16fcd37d18ebe217a2c9680c8c535042d2759852c929cd649d662c6a2bc603d934a6ba770ef945752c99d150f539e1fdd0d9be0ad51 SHA512 cee4e0d1a2b203cadaaa5678c5ce17302f18ffa55d07c8329392b1ea84740340c006eb9ab5920beef80835c2a399d5fffca409b8288e10ae62d290af62ec4ab8 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826 SHA512 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940 SHA512 817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f SHA512 cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce diff --git a/dev-db/mariadb/files/MDEV-20987-fulltext.patch b/dev-db/mariadb/files/MDEV-20987-fulltext.patch deleted file mode 100644 index 4052938b052..000 --- a/dev-db/mariadb/files/MDEV-20987-fulltext.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 5c3bbbd845fe38a125553c62976c1165b2d9b8d7 Mon Sep 17 00:00:00 2001 -From: Thirunarayanan Balathandayuthapani -Date: Wed, 6 Nov 2019 10:20:32 +0530 -Subject: [PATCH] MDEV-20987 InnoDB fails to start when fts table has FK - relation - -InnoDB: Assertion failure in file .../dict/dict0dict.cc line ... -InnoDB: Failing assertion: table->can_be_evicted - -This fixes a regression that was caused by the fix of MDEV-20621 -(commit a41d429765c7ddb528b9b438c68b25ff55d3bd55). -MySQL 5.6 (and MariaDB 10.0) introduced eviction of tables from -the InnoDB data dictionary cache. Tables that are connected to -FOREIGN KEY constraints or FULLTEXT INDEX are exempt of the eviction. -With the problematic change, a table that would already be exempt -from eviction due to FOREIGN KEY would cause the problem if there -also was a FULLTEXT INDEX defined on it. - -dict_load_table(): Only prevent eviction if table->can_be_evicted holds. - .../suite/innodb_fts/r/innodb_fts_misc.result | 21 ++-- - .../suite/innodb_fts/t/innodb_fts_misc.test | 24 +++ - storage/innobase/dict/dict0load.cc| 2 +- -
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/
commit: f60a97d01ed72dfd406403a7f58ec0f422e1c85d Author: Brian Evans gentoo org> AuthorDate: Wed Nov 6 18:07:20 2019 + Commit: Brian Evans gentoo org> CommitDate: Wed Nov 6 18:12:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60a97d0 dev-db/mariadb: Version bump for 10.2.28 Bug: https://bugs.gentoo.org/699424 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/Manifest| 1 + dev-db/mariadb/files/MDEV-20987-fulltext.patch | 185 + dev-db/mariadb/mariadb-10.2.28.ebuild | 987 + 3 files changed, 1173 insertions(+) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 9a19448ee76..7958d696b60 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -3,6 +3,7 @@ DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 91ebc6d24c80ad9651c42a2f4553ce3ec3b DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c SHA512 1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124 DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 7e4ae229040b3136ad107979864bc391556c1ba83847addd89e09f3757cd01203503e07832abe496a7f560048ed704f273607da3a114afa59ceb13cbb3b89c14 SHA512 9ea7ea30f964d022d16c662c18ac40ea50ef5b6592d02ba739ad81f9dfa9e60be90ea6d4706b43b07402c4cbc8c0280633b6e21bda6daf5bbc1d3c540993e4d6 +DIST mariadb-10.2.28.tar.gz 73078014 BLAKE2B cd1f11c35538590f0e864d1ab4696e1eaa3e239fc9760e00c3ad09aa054bb58f425931516e2ec2ef88869ab79039a95aec14d28e430e9a14169ec7d305ea SHA512 4fdad47cdbe0643c8a9d40210aef0c135ee42b1696f6b9903e155522c8481f284d14dd96b21f06eb64f7b0dbb7591844109a03a2836cfb8a187b7aac8037c815 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826 SHA512 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940 SHA512 817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f SHA512 cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce diff --git a/dev-db/mariadb/files/MDEV-20987-fulltext.patch b/dev-db/mariadb/files/MDEV-20987-fulltext.patch new file mode 100644 index 000..4052938b052 --- /dev/null +++ b/dev-db/mariadb/files/MDEV-20987-fulltext.patch @@ -0,0 +1,185 @@ +From 5c3bbbd845fe38a125553c62976c1165b2d9b8d7 Mon Sep 17 00:00:00 2001 +From: Thirunarayanan Balathandayuthapani +Date: Wed, 6 Nov 2019 10:20:32 +0530 +Subject: [PATCH] MDEV-20987 InnoDB fails to start when fts table has FK + relation + +InnoDB: Assertion failure in file .../dict/dict0dict.cc line ... +InnoDB: Failing assertion: table->can_be_evicted + +This fixes a regression that was caused by the fix of MDEV-20621 +(commit a41d429765c7ddb528b9b438c68b25ff55d3bd55). +MySQL 5.6 (and MariaDB 10.0) introduced eviction of tables from +the InnoDB data dictionary cache. Tables that are connected to +FOREIGN KEY constraints or FULLTEXT INDEX are exempt of the eviction. +With the problematic change, a table that would already be exempt +from eviction due to FOREIGN KEY would cause the problem if there +also was a FULLTEXT INDEX defined on it. + +dict_load_table(): Only prevent eviction if table->can_be_evicted holds. +--- + .../suite/innodb_fts/r/innodb_fts_misc.result | 21 ++-- + .../suite/innodb_fts/t/innodb_fts_misc.test | 24 +++ + storage/innobase/dict/dict0load.cc| 2 +- + storage/xtradb/dict/dict0load.cc | 2 +- + 4 files changed, 17 insertions(+), 32 deletions(-) + +diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result +index 71eded74be46..a2a73840723d 100644 +--- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result +@@ -1,4 +1,3 @@ +-drop table if exists t1; + CREATE TABLE t1 ( + id INT
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/
commit: c50fef32cdf155707ff367f2990996be6c010b1f Author: Brian Evans gentoo org> AuthorDate: Wed Aug 7 16:53:24 2019 + Commit: Brian Evans gentoo org> CommitDate: Wed Aug 7 16:54:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50fef32 dev-db/mariadb: Revbump for critical replication bug MDEV-20247 Replication hangs with "preparing" and never starts Include upstream fix Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Brian Evans gentoo.org> .../files/MDEV-20247-replication-10.2.patch| 108 ++ dev-db/mariadb/files/MDEV-20247-replication.patch | 121 + ...db-10.1.41.ebuild => mariadb-10.1.41-r1.ebuild} | 1 + ...db-10.2.26.ebuild => mariadb-10.2.26-r1.ebuild} | 1 + ...db-10.3.17.ebuild => mariadb-10.3.17-r1.ebuild} | 1 + ...iadb-10.4.7.ebuild => mariadb-10.4.7-r1.ebuild} | 1 + 6 files changed, 233 insertions(+) diff --git a/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch b/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch new file mode 100644 index 000..193f2dd7750 --- /dev/null +++ b/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch @@ -0,0 +1,108 @@ +From 47f8a18fec604983e47fdf7c822d94b26d85cade Mon Sep 17 00:00:00 2001 +From: Thirunarayanan Balathandayuthapani +Date: Wed, 7 Aug 2019 12:35:04 +0530 +Subject: [PATCH] MDEV-20247 Replication hangs with "preparing" and never + starts + +- The commit ab6dd774082c57f48d998e03655c06b672799b2d wrongly sets the +condition inside innobase_srv_conc_enter_innodb(). Problem is that +InnoDB makes the thread to sleep indefinitely if it is a replication +slave thread. + +Thanks to Sujatha Sivakumar for contributing the replication test case. +--- + .../r/rpl_sync_with_innodb_thd_conc.result| 13 ++ + .../rpl/t/rpl_sync_with_innodb_thd_conc.test | 41 +++ + storage/innobase/handler/ha_innodb.cc | 6 +-- + 4 files changed, 60 insertions(+), 6 deletions(-) + create mode 100644 mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result + create mode 100644 mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test + +diff --git a/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result +new file mode 100644 +index ..0ed894336a1c +--- /dev/null b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result +@@ -0,0 +1,18 @@ ++include/master-slave.inc ++[connection master] ++connection slave; ++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency; ++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay; ++SET GLOBAL innodb_thread_concurrency = 100; ++connection master; ++CREATE TABLE t(f INT) ENGINE=INNODB; ++INSERT INTO t VALUES (10); ++connection slave; ++include/diff_tables.inc [master:t, slave:t] ++"= Clean up===" ++connection master; ++DROP TABLE t; ++connection slave; ++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency; ++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay; ++include/rpl_end.inc +diff --git a/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test +new file mode 100644 +index ..b4c2971d2fbc +--- /dev/null b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test +@@ -0,0 +1,41 @@ ++# Purpose ++# ++# Test verifies that replication shouldn't hang when number of active threads ++# on the slave server are less than the allowed innodb_thread_concurrency value. ++# ++# Implementation ++# ++# Steps: ++#0 - Have master slave replication setup with engine being Innodb. ++#1 - Configure innodb_thread_concurrency = 100. ++#2 - Do some DML on master and sync the slave with master. ++#3 - Ensure replication doesn't hang. ++# ++# References ++# ++# MDEV-20247: Replication hangs with "preparing" and never starts ++# ++ ++--source include/master-slave.inc ++--source include/have_innodb.inc ++ ++--connection slave ++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency; ++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay; ++SET GLOBAL innodb_thread_concurrency = 100; ++ ++--connection master ++CREATE TABLE t(f INT) ENGINE=INNODB; ++INSERT INTO t VALUES (10); ++--sync_slave_with_master ++ ++--let $diff_tables=master:t, slave:t ++--source include/diff_tables.inc ++ ++--echo "= Clean up===" ++--connection master ++DROP TABLE t; ++--sync_slave_with_master ++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency; ++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay; ++--source include/rpl_end.inc +diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc +index 081fcbd9c51e..5dfe240631b8 100644 +--- a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc +@@ -1686,9 +1686,9 @@
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/
commit: 8ccdea33765f7ff11b70a019e2cfd145d5c92b8b Author: Brian Evans gentoo org> AuthorDate: Thu Mar 14 13:51:20 2019 + Commit: Brian Evans gentoo org> CommitDate: Thu Mar 14 13:51:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccdea33 dev-db/mariadb: Fix config variable that could stop mysqldump Make the option loose such that those that use it will and ignored by others Closes: https://bugs.gentoo.org/680318 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/files/my.cnf.distro-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-db/mariadb/files/my.cnf.distro-client b/dev-db/mariadb/files/my.cnf.distro-client index 4bbe0f976c6..1b9cdabdb2f 100644 --- a/dev-db/mariadb/files/my.cnf.distro-client +++ b/dev-db/mariadb/files/my.cnf.distro-client @@ -4,7 +4,7 @@ [client] socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock character-sets-dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets -default-character-set=utf8 +loose-default-character-set=utf8 [mysql] # uncomment the next directive if you are not familiar with SQL
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/
commit: 95580e49776b6d9c6248723bd931790590d299f1 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Feb 12 16:25:58 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Feb 27 05:35:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95580e49 dev-db/mariadb: remove unused files Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Aaron Bauman gentoo.org> dev-db/mariadb/files/my.cnf-5.1 | 145 dev-db/mariadb/files/my.cnf-5.6 | 142 --- 2 files changed, 287 deletions(-) diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1 deleted file mode 100644 index ec5abfbde9d..000 --- a/dev-db/mariadb/files/my.cnf-5.1 +++ /dev/null @@ -1,145 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock - -[mysql] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqladmin] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlcheck] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqldump] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlimport] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlshow] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -default-character-set=utf8 - -[myisamchk] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets - -[myisampack] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets - -# use [safe_mysqld] with mysql-3 -[mysqld_safe] -err-log= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err - -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations -[mysqld] -character-set-server = utf8 -user = mysql -port = 3306 -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock -pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid -log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err -basedir= @GENTOO_PORTAGE_EPREFIX@/usr -datadir= @DATADIR@ -skip-external-locking -key_buffer = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size= 8M -language = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english - -# security: -# using "localhost" in connects uses sockets by default -# skip-networking -bind-address = 127.0.0.1 - -log-bin -server-id = 1 - -# point the following paths to different dedicated disks -tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ -#log-update= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname - -# you need the debug USE flag enabled to use the following directives, -# if needed, uncomment them, start the server and issue -# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace -# this will show you *exactly* what's happening in your server ;) - -#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql -#gdb -#debug = d:t:i:o,/tmp/mysqld.trace -#one-thread - -# uncomment the following directives if you are using BDB tables -#bdb_cache_size= 4M -#bdb_max_lock = 1 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# -# the rest of the innodb config follows: -# don't eat too much memory, we're trying to be safe on 64Mb boxes -# you might want to bump this up a bit on boxes with more RAM -innodb_buffer_pool_size = 16M -# this is the default, increase it if you have lots of tables -innodb_additional_mem_pool_size = 2M -# -# i'd like to use
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/
commit: d5a69bdef5917ff3235f962dbf624d31b3a4d911 Author: Brian Evans gentoo org> AuthorDate: Thu Jun 21 12:39:14 2018 + Commit: Brian Evans gentoo org> CommitDate: Thu Jun 21 12:39:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a69bde dev-db/mariadb: Fix default location of charset files Closes: https://bugs.gentoo.org/658632 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-db/mariadb/files/my.cnf-5.6-r1 | 142 + ...10.0.35-r1.ebuild => mariadb-10.0.35-r2.ebuild} | 6 +- dev-db/mariadb/mariadb-10.1.34.ebuild | 2 +- 3 files changed, 146 insertions(+), 4 deletions(-) diff --git a/dev-db/mariadb/files/my.cnf-5.6-r1 b/dev-db/mariadb/files/my.cnf-5.6-r1 new file mode 100644 index 000..cde5312a568 --- /dev/null +++ b/dev-db/mariadb/files/my.cnf-5.6-r1 @@ -0,0 +1,142 @@ +# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file. + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets +default-character-set=utf8 + +[mysqladmin] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets + +[myisampack] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets + +# use [safe_mysqld] with mysql-3 +[mysqld_safe] +err-log= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err + +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations +[mysqld] +character-set-server = utf8 +user = mysql +port = 3306 +socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock +pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid +log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err +basedir= @GENTOO_PORTAGE_EPREFIX@/usr +datadir= @DATADIR@ +skip-external-locking +key_buffer_size= 16M +max_allowed_packet = 4M +table_open_cache = 400 +sort_buffer_size = 512K +net_buffer_length = 16K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size= 8M +lc_messages_dir= @GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb +#Set this to your desired error message language +lc_messages= en_US + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = 127.0.0.1 + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ +#log-update= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname + +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue +# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace +# this will show you *exactly* what's happening in your server ;) + +#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql +#gdb +#debug = d:t:i:o,/tmp/mysqld.trace +#one-thread + +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +innodb_buffer_pool_size = 128M +# +# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route +# we have to take for the moment +#innodb_data_home_dir =
