Skip to content

Prepare upload to MariaDB 10.6.19 to Ubuntu 22.04 "Jammy"

Similar to !106 (merged), !85 (merged), !93 (merged), !69 (merged) and !59 (merged), this Merge Request contains the import of a new upstream version of MariaDB.

Do not review merge commits or upstream commits, but focus on the ones that are made only on the proposed ubuntu/22.04-jammy branch update in this MR:

git log --first-parent --reverse --format='format:* %C(yellow)%h%C(reset) %s' origin/ubuntu/22.04-jammy...

  • 6794713d Update upstream source from tag 'upstream/10.6.19'
  • 0cc22622 Update changelog and refresh patches after 10.6.19 import
  • 259cbee8 Add NEWS item to explain new mariadb-dump option --sandbox
  • bc96afe7 Add main.having_cond_pushdown to MTR skiplist on s390x
  • e89abdaa Salsa CI: Add minimal Ubuntu pipeline for stable update regression testing
  • 713dae49 Salsa CI: Also check that Lintian does not regress
  • 69d555ef Update upstream source from tag 'upstream/10.6.21'
  • 44550a67 Update changelog and refresh patches after 10.6.21 import
  • 0aa37583 Add Lintian overrides for new issues that are not relevant for maintenance
  • 3408c814 Make SysV init more verbose in case of MariaDB start failures
  • 605d9b4c Apply "Limit check of running mysqld/mariadbd to system users (Closes: #1032047)"
  • 5277457a When shutting down 'mariadbd', fallback to 'mysqld'
  • d570f463 Make error more helpful in case server restart fails (Related: #1033234)
  • b695ce81 MDEV-35907 debian-start script fails when using non-standard socket path
  • e7ab4c03 Add some info on getting back to passwordless root (Closes: #1088133)
  • 4d62d0fc Update changelog for 1:10.6.21-0ubuntu0.22.04.1 release

Changelog:

mariadb-10.6 (1:10.6.21-0ubuntu0.22.04.1) jammy-security; urgency=medium

[ Otto Kekäläinen ]
* SECURITY UPDATE: New upstream version 10.6.21 includes fixes for regressions
  as noted at https://mariadb.com/kb/en/mariadb-10-6-21-release-notes/ and
  also fixes the following security vulnerabilities (LP: #2099785):
  - CVE-2025-21490
* New upstream version 10.6.20. Includes fixes for several severe regressions
  as noted at https://mariadb.com/kb/en/mariadb-10-6-20-release-notes/
* New upstream version 10.6.19. Includes fixes for several severe regressions
  as noted at https://mariadb.com/kb/en/mariadb-10-6-19-release-notes/
* Include Debian packaging bugfixes done upstream:
  - MDEV-35907: debian-start script fails when using non-standard socket path
* Add main.having_cond_pushdown to MTR skiplist on s390x
* Include several restart/shutdown related fixes that have been in Debian
  unstable in MariaDB 11.4 for a long time, and which are likely needed to
  avoid occasional shutdown issues, in particular on upgrades (LP: #2011293)
  in both Debian and Ubuntu
  - Make SysV init more verbose in case of MariaDB start failures (Related: #1033234)
  - Limit check of running mysqld/mariadbd to system users (Related: #1032047)
  - When shutting down 'mariadbd', fallback to 'mysqld'
* Add Lintian overrides for new issues that are not relevant for maintenance
* Add NEWS item to explain new `mariadb-dump` option `--sandbox`

[ Phil Dibowitz ]
* Add some info on getting back to passwordless root (Related: #1088133)

 -- Otto Kekäläinen <otto@debian.org>  Sat, 22 Feb 2025 21:10:25 -0800

Test builds visible at https://launchpad.net/~mysql-ubuntu/+archive/ubuntu/mariadb/+builds?build_text=&build_state=all

Unfortunately riscv64 is failing on unclear reason:

[ 11%] Building CXX object mysys/CMakeFiles/mysys.dir/lf_hash.cc.o
cd /<<PKGBUILDDIR>>/builddir/mysys && /usr/bin/c++ -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -I/<<PKGBUILDDIR>>/wsrep-lib/include -I/<<PKGBUILDDIR>>/wsrep-lib/wsrep-API/v26 -I/<<PKGBUILDDIR>>/builddir/include -I/<<PKGBUILDDIR>>/include -I/<<PKGBUILDDIR>>/mysys -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wdate-time -D_FORTIFY_SOURCE=2 -pie -fPIC -fstack-protector --param=ssp-buffer-size=4 -O3 -g -DNDEBUG -g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized -fno-omit-frame-pointer -D_FORTIFY_SOURCE=2 -DDBUG_OFF -Wall -Wenum-compare -Wenum-conversion -Wextra -Wformat-security -Wmissing-braces -Wno-format-truncation -Wno-init-self -Wno-nonnull-compare -Wno-unused-parameter -Wnon-virtual-dtor -Woverloaded-virtual -Wsuggest-override -Wvla -Wwrite-strings   -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -std=gnu++11 -MD -MT mysys/CMakeFiles/mysys.dir/lf_hash.cc.o -MF CMakeFiles/mysys.dir/lf_hash.cc.o.d -o CMakeFiles/mysys.dir/lf_hash.cc.o -c /<<PKGBUILDDIR>>/mysys/lf_hash.cc
In file included from /<<PKGBUILDDIR>>/mysys/lf_hash.cc:30:
/<<PKGBUILDDIR>>/include/my_cpu.h: In function ‘void MY_RELAX_CPU()’:
/<<PKGBUILDDIR>>/include/my_cpu.h:100:3: error: ‘__builtin_riscv_pause’ was not declared in this scope; did you mean ‘__builtin_riscv_fsflags’?
  100 |   __builtin_riscv_pause();
      |   ^~~~~~~~~~~~~~~~~~~~~
      |   __builtin_riscv_fsflags
make[4]: *** [mysys/CMakeFiles/mysys.dir/build.make:1395: mysys/CMakeFiles/mysys.dir/lf_hash.cc.o] Error 1
Edited by Otto Kekäläinen

Merge request reports

Loading