diff options
author | nia <nia@pkgsrc.org> | 2021-07-24 11:49:44 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2021-07-24 11:49:44 +0000 |
commit | 2088d6db7ff604234f8c01697669bdf10d5a6aab (patch) | |
tree | f716f83cb8ac11e40f22ac5465fd21339a35fb93 /databases | |
parent | 855dd565d1d587b934497bb402cf389ebe395ad6 (diff) | |
download | pkgsrc-2088d6db7ff604234f8c01697669bdf10d5a6aab.tar.gz |
mariadb104: Update to 10.4.20
This version of MariaDB is being released now to fix the following two regressions:
Table alias from previous statement interferes later commands (MDEV-25672)
Join using derived with aggregation returns incorrect results (MDEV-25714)
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mariadb104-client/Makefile | 3 | ||||
-rw-r--r-- | databases/mariadb104-client/Makefile.common | 4 | ||||
-rw-r--r-- | databases/mariadb104-client/distinfo | 12 | ||||
-rw-r--r-- | databases/mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake | 15 | ||||
-rw-r--r-- | databases/mariadb104-client/patches/patch-sql_mysqld.cc | 18 | ||||
-rw-r--r-- | databases/mariadb104-server/Makefile | 3 | ||||
-rw-r--r-- | databases/mariadb104-server/PLIST | 4 |
7 files changed, 10 insertions, 49 deletions
diff --git a/databases/mariadb104-client/Makefile b/databases/mariadb104-client/Makefile index e3b2364864f..7c797555e18 100644 --- a/databases/mariadb104-client/Makefile +++ b/databases/mariadb104-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2021/05/24 19:49:29 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2021/07/24 11:49:44 nia Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 3 COMMENT= MariaDB 10.4, a free MySQL compatible database (client) CONFLICTS= mysql-client-[0-9]* diff --git a/databases/mariadb104-client/Makefile.common b/databases/mariadb104-client/Makefile.common index 43f83feae01..59f58ba229d 100644 --- a/databases/mariadb104-client/Makefile.common +++ b/databases/mariadb104-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.10 2021/07/13 07:44:14 nia Exp $ +# $NetBSD: Makefile.common,v 1.11 2021/07/24 11:49:44 nia Exp $ # # used by databases/mariadb104-client/Makefile # used by databases/mariadb104-server/Makefile -DISTNAME= mariadb-10.4.18 +DISTNAME= mariadb-10.4.20 CATEGORIES= databases MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/ diff --git a/databases/mariadb104-client/distinfo b/databases/mariadb104-client/distinfo index 4e8d2147e36..8b38f6bfcad 100644 --- a/databases/mariadb104-client/distinfo +++ b/databases/mariadb104-client/distinfo @@ -1,21 +1,19 @@ -$NetBSD: distinfo,v 1.2 2021/05/12 11:20:29 nia Exp $ +$NetBSD: distinfo,v 1.3 2021/07/24 11:49:44 nia Exp $ -SHA1 (mariadb-10.4.18.tar.gz) = 82454d8f04c8728ba9df3cefd25747da7dfc25bb -RMD160 (mariadb-10.4.18.tar.gz) = b60d4820bab723851510e873daef8dae42b120bd -SHA512 (mariadb-10.4.18.tar.gz) = 085c2468484d997facb021ea7cba4895729b6c5769d715e30cf1dfd62c3a291e5025774420ed278f9470de20be8d3537f03c7d1cc5482d957bc91eb072cd9c12 -Size (mariadb-10.4.18.tar.gz) = 81733656 bytes +SHA1 (mariadb-10.4.20.tar.gz) = 65c3ff44b60d3c10e36f1e9752e0e4b84fa00521 +RMD160 (mariadb-10.4.20.tar.gz) = 5fa098a1091ac83e346cba986672b91d2f027e3b +SHA512 (mariadb-10.4.20.tar.gz) = ce8e0691981b39de380276cea5d553a9968d9f6ef19f54395128f01d611499f3fc203651b8d7cb56697c6ee55f5f515c960d7700738cdc50f228df7443505112 +Size (mariadb-10.4.20.tar.gz) = 82043644 bytes SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f SHA1 (patch-CMakeLists.txt) = 9d11b3d80b4b32558cd284de060975791708f0fc SHA1 (patch-client_CMakeLists.txt) = 54a2b8797c133417de572cd8d9930d6934a5c937 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 -SHA1 (patch-libmariadb_cmake_ConnectorName.cmake) = 57f891c4bd035afb4aa0b03c269ce859456e9f46 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317 SHA1 (patch-scripts_CMakeLists.txt) = d0c0ac4d3b1b14d9fd1c72c5fad8a3985de19a8f SHA1 (patch-scripts_mysql__install__db.sh) = adf20e80a9881db97f3d2dd8279e52bcedf0bead SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f -SHA1 (patch-sql_mysqld.cc) = 21f9ea79ca90a78f18598d55f209a1835b95858f SHA1 (patch-sql_threadpool__generic.cc) = 73df368457a2e88f3cc3221031e565c4208b87ab SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836 diff --git a/databases/mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake deleted file mode 100644 index e56346ca2c2..00000000000 --- a/databases/mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-libmariadb_cmake_ConnectorName.cmake,v 1.1 2021/05/08 19:47:16 jdolecek Exp $ - -Fix control flow. - ---- libmariadb/cmake/ConnectorName.cmake.orig 2021-02-18 23:22:28.000000000 +0000 -+++ libmariadb/cmake/ConnectorName.cmake -@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - SET(MACHINE_NAME "x64") - ELSE() - SET(MACHINE_NAME "32") -- END() -+ ENDIF() - ENDIF() - - SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/databases/mariadb104-client/patches/patch-sql_mysqld.cc b/databases/mariadb104-client/patches/patch-sql_mysqld.cc deleted file mode 100644 index cff7d5642dc..00000000000 --- a/databases/mariadb104-client/patches/patch-sql_mysqld.cc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-sql_mysqld.cc,v 1.1 2021/05/08 19:47:16 jdolecek Exp $ - -NetBSD does not have SI_KERNEL... - ---- sql/mysqld.cc.orig 2020-01-26 20:43:53.000000000 +0000 -+++ sql/mysqld.cc -@@ -3282,7 +3282,11 @@ pthread_handler_t signal_hand(void *arg - } - break; - case SIGHUP: -+#ifdef SI_KERNEL - if (!abort_loop && origin != SI_KERNEL) -+#else -+ if (!abort_loop) -+#endif - { - int not_used; - mysql_print_status(); // Print some debug info diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 3879ca58f35..3ed75f53eb9 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2021/07/12 22:39:59 nia Exp $ +# $NetBSD: Makefile,v 1.11 2021/07/24 11:49:44 nia Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 7 COMMENT= MariaDB 10.4, a free MySQL compatible database (server) CONFLICTS= mysql-server-[0-9]* diff --git a/databases/mariadb104-server/PLIST b/databases/mariadb104-server/PLIST index ad5ebd7f227..7b0b6cbd342 100644 --- a/databases/mariadb104-server/PLIST +++ b/databases/mariadb104-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2021/07/04 10:58:59 nia Exp $ +@comment $NetBSD: PLIST,v 1.5 2021/07/24 11:49:44 nia Exp $ bin/aria_chk bin/aria_dump_log bin/aria_ftdump @@ -332,7 +332,6 @@ sbin/mariadbd sbin/mysqld share/doc/mysql/COPYING share/doc/mysql/CREDITS -share/doc/mysql/EXCEPTIONS-CLIENT share/doc/mysql/INSTALL-BINARY share/doc/mysql/README-wsrep share/doc/mysql/README.md @@ -386,7 +385,6 @@ share/mysql/mysql_system_tables.sql share/mysql/mysql_system_tables_data.sql share/mysql/mysql_test_data_timezone.sql share/mysql/mysql_test_db.sql -share/mysql/mysql_to_mariadb.sql share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian/errmsg.sys share/mysql/polish/errmsg.sys |