diff --git a/gcc13-fix.patch b/gcc13-fix.patch index e03b97b..d0b8ac7 100644 --- a/gcc13-fix.patch +++ b/gcc13-fix.patch @@ -58,15 +58,3 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h #include "rocksdb/rocksdb_namespace.h" -Index: mariadb-10.11.3/tpool/aio_linux.cc -=================================================================== ---- mariadb-10.11.3.orig/tpool/aio_linux.cc -+++ mariadb-10.11.3/tpool/aio_linux.cc -@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi - # include - # include - # include -+# include - - /** - Invoke the io_getevents() system call, without timeout parameter. diff --git a/macros.mariadb-test b/macros.mariadb-test index ea050cb..79c8f6e 100644 --- a/macros.mariadb-test +++ b/macros.mariadb-test @@ -57,7 +57,7 @@ mysql_install_db --defaults-file=$TEST_RUN_DIR/my.cnf \ \ echo '>>> Invoking mysqld' \ /usr/sbin/mysqld --defaults-file=$TEST_RUN_DIR/my.cnf& \ -sleep 2 \ +sleep 10 \ \ echo ">>> Creating \'$TEST_DB\' database, (credentials: $TEST_USER, $TEST_PASS)" \ mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild password abuildpw \ diff --git a/mariadb-11.5.2.tar.gz b/mariadb-11.5.2.tar.gz deleted file mode 100644 index 4c6461c..0000000 --- a/mariadb-11.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e25fac00aeb34610faf62182836a14e3310c0ca5d882e9109f63bd8dfdc3542d -size 108221481 diff --git a/mariadb-11.5.2.tar.gz.asc b/mariadb-11.5.2.tar.gz.asc deleted file mode 100644 index 0ce8d06..0000000 --- a/mariadb-11.5.2.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmaxf6gACgkQ8WVvJMdM -0diboxAA7mHaK3gKRt0Ghko+HeQqhyDovPBSaxM+Z/2SY3KxHSbkzVLnMSOVn4Wy -Jj4dHBDRTpZqBmLep5Xi0qgYRoiVaUC4hBmk4oAD7rRRLSf3LYVTHtst5HZeIRMm -XuP/+egoP/Jb6C14cZilzB7nEc31mNpCqhARShm2fQmZ+SuKBoiUrYfNKH4/fqd2 -KbOCWxigitOieWKPUMk+g+qBa2ETbWOzcWvhECeavLJ+kgGIm43KRJ17lyHlBbFR -Cey/XHfVrdpCmV9uqJectnfnXTFqZ/uxINMKMyX2I53tB7oNBzGa4feOwqhlQiUd -raiaCdbit7fs1ud9yDDW41gJzopR7i/X2PRWk7w+zl8ioNiCu/KlSOs2naPeCzez -dRbNxU8Samjey8uprXMyioAsrX8gv7al/eFVqgxxCumc3nO7Umpmi2tHvWx+B98T -8HEbY7p31qCxk+fkwqcZc03g1p2XcxsfVb5jzzYxjk08g3zZAIueDab9umViIPBH -S0JYwUbm0bktUW5E3qaMEh9UA6Tu8L2b9q+eESRllYqNsB3mU5ik6gLBd8Ly5GQ4 -UTKRq+oYjqZt9X7m1jQJ9IdIQtwMfxhDJa0mPvekB8abT80CuzXwStYvA9n1QMas -QgRhRpG2yoCoL/u5BwtjvyzPKYTYvC/jc8pk/A+CJCgFHTAC4o8= -=fqEG ------END PGP SIGNATURE----- diff --git a/mariadb-11.6.1.tar.gz b/mariadb-11.6.1.tar.gz new file mode 100644 index 0000000..2371e7b --- /dev/null +++ b/mariadb-11.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98ea7aa7827b37af69d5eb20f21bb06a46bc5c7345ea8d42107ea2e5acd32cc5 +size 108262149 diff --git a/mariadb-11.6.1.tar.gz.asc b/mariadb-11.6.1.tar.gz.asc new file mode 100644 index 0000000..d3ed89f --- /dev/null +++ b/mariadb-11.6.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAma6Kp8ACgkQ8WVvJMdM +0dhnfQ//ecmFUQ43nT4uBiZUmlnzLCRZcmB0XbZlF2Vc3FRJBXfCChnX5gL997gT +++/rLnX250SC2HES4FSKmb63GnZyul13rAHvK2K6FcjlmJqOeX6JJHnrOUOyYsJ7 +XFE9dn3p9O/mNPg7CtfYuRHsMbg5k+5lZ1KmTUMQ1ln+wfYQ0AYuyAMd31AKZgNv +4GkhN9e1e/TuNnUw9lWKsQeedLQtaAzTeKuM9h4fbO7gMVmo/Xd1qlcArd+YqpGq +xr1NEPQZy0DRJR7ffhwaK5cOgCdbTu9Y6ESi9SFKhftzJtG9XN8mPzp+JKYphpsv +l6w5SVISpcgvS9BqFw5T+curtbyF7I4AfNs3pm7qW8Pz8M4lxIL2fvbhdkbu29Ca +iJtOpqhLYqAeq6F3POXmI07EicwH2H/Wdp3orlm2onqoAwKmDoNaJ3yKAHu2NeaU +LLF2PVc8zN0HQ1LO57eQPSV2sVInPUi9Hiicb+kqXgQIrtHiXw0APc1nM3Td47mf +Iup+MSe0mLRLtFWD7mesmksglkqiO8hFz7HKS/Jk2cn3u/fIczJ+ug0w9C2fHBvz +B5a5aWAhgm2sh18y/EXBIDZTmqhknucHXssIw1lLDPhkPOms1oM7pbqOtlNPEp8G +jEZQYN65qqhfiaTz5K4Fj+tFUG7Hx1SlAfP8e6n4M15c2976gSw= +=ZLzv +-----END PGP SIGNATURE----- diff --git a/mariadb.changes b/mariadb.changes index d49619b..b1ea692 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Nov 14 21:10:35 UTC 2024 - Antonio Teixeira + +- Update to 11.6.1: + https://mariadb.com/kb/en/mariadb-11-6-1-releasqe-notes/ + https://mariadb.com/kb/en/mariadb-11-6-1-changelog/ +- Update list of skipped tests +- Refresh gcc13-fix.patch + +------------------------------------------------------------------- +Mon Nov 11 10:36:05 UTC 2024 - Andreas Schwab + +- Reduce race in %mysql_testserver_start + ------------------------------------------------------------------- Sun Sep 22 22:31:04 UTC 2024 - Georg Pfuetzenreuter diff --git a/mariadb.spec b/mariadb.spec index c8ef462..c8d41b9 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -52,14 +52,14 @@ # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available %define with_cracklib_plugin 0 Name: mariadb -Version: 11.5.2 +Version: 11.6.1 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers URL: https://www.mariadb.org -Source: https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz -Source1: https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc +Source: https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz +Source1: https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring Source4: README.debug Source5: suse-test-run diff --git a/suse_skipped_tests.list b/suse_skipped_tests.list index 752271c..2b7d109 100644 --- a/suse_skipped_tests.list +++ b/suse_skipped_tests.list @@ -48,4 +48,5 @@ binlog.max_binlog_total_size : since 11.4.2 - all main.mysqld--help-aria : since 11.5.2 - all plugins.feedback_plugin_load : since 11.5.2 - all +plugins.parsec : since 11.6.1 - all