mysql-test/lib/process-purecov-annotations.pl | 2 1 + 1 - 0 !
mysql-test/lib/v1/mysql-test-run.pl | 2 1 + 1 - 0 !
mysql-test/mariadb-stress-test.pl | 2 1 + 1 - 0 !
mysql-test/mariadb-test-run.pl | 2 1 + 1 - 0 !
mysql-test/std_data/checkDBI_DBD-MariaDB.pl | 2 1 + 1 - 0 !
mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl | 2 1 + 1 - 0 !
mysql-test/suite/funcs_1/lib/DataGen_local.pl | 2 1 + 1 - 0 !
mysql-test/suite/funcs_1/lib/DataGen_modify.pl | 2 1 + 1 - 0 !
mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl | 2 1 + 1 - 0 !
mysql-test/suite/rpl/extension/checksum.pl | 2 1 + 1 - 0 !
scripts/mytop.sh | 2 1 + 1 - 0 !
11 files changed, 11 insertions(+), 11 deletions(-)

 fix perl path in scripts

Fix Lintian issue https://lintian.debian.org/tags/incorrect-path-for-interpreter.html

Upstream will never accept this patch,
see https://github.com/MariaDB/server/pull/1718

storage/mroonga/CMakeLists.txt | 12 4 + 8 - 0 !
1 file changed, 4 insertions(+), 8 deletions(-)

 cmake: add support for reproducible builds

We should use relative path not absolute path. We can use target without
breaking reproducibility.

cmake/install_layout.cmake | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 install pam modules and systemd units into /usr

Since Debian trixie all files need to be installed into their canonical
location under /usr.

sql/mysqld.cc | 20 15 + 5 - 0 !
1 file changed, 15 insertions(+), 5 deletions(-)

 show banner in server and client startup to drive community
 engagement

Suggest to users that they can support MariaDB development by simply giving a
star on GitHub. This patch experiments with how well such a banner works, and
may later change the contents to drive some other kind of engagement.

Client output:

    Welcome to the MariaDB monitor.  Commands end with ; or \g.
    Your MariaDB connection id is 17
    Server version: 11.8.1-MariaDB-5 from Debian -- Please help get to 10k stars at https://github.com/MariaDB/Server

    Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.

    Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

    MariaDB [(none)]>

Server output:
    [Note] Please help get to 10k stars at https://github.com/MariaDB/Server

Server output if built in git directory:
    [Note] Starting MariaDB 11.8.1-MariaDB-5 from Debian source revision 1a9c3debfd6b1b16af4e501d3530b866b85c38a8 server_uid eNAjF8/wvUNM09/mSmh+k3a5o5w= as process 1359

Logs will also show as server output:
    mysqld: Version: '11.8.1-MariaDB-5 from Debian'  socket: '/run/mysqld/mysqld.sock'  port: 3306  -- Please help get to 10k stars at https://github.com/MariaDB/Server

mysys/my_init.c | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 disable the 'mysql*' command deprecation warning

Many command-line tools expect the commands they run to return without
any output in stderr or having error codes. The fact that now in MariaDB
11.4 all 'mysql*' commands emit a deprecation warning causes a lot of
scripts to fail, such as the /etc/init.d/mariadb itself and many dependent
programs as witnessed via Debian autopkgtests. See examples below.

https://ci.debian.net/packages/m/mariadb-connector-odbc/testing/amd64/48373500/
https://ci.debian.net/packages/p/pam-mysql/testing/amd64/48373511/
https://ci.debian.net/packages/r/roundcube/testing/amd64/48373518/

tests/mysql_client_fw.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 make compile_time_assert compatible with x32 (closes: #1063738)

The x32 build was failing on:

    compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);

Reported upstream at https://jira.mariadb.org/browse/MDEV-34195.
This is a regression from upstream commits c432c9ef and 06a884a57071.

Fix is based on advice from https://lists.debian.org/debian-amd64/2024/07/msg00003.html
which is also aligned with https://wiki.debian.org/X32Port.

extra/mariabackup/innobackupex.cc | 4 2 + 2 - 0 !
extra/mariabackup/xtrabackup.cc | 6 3 + 3 - 0 !
mysql-test/main/mysqld--help.result | 15 8 + 7 - 0 !
mysql-test/suite/sys_vars/r/sysvars_innodb.result | 2 1 + 1 - 0 !
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result | 2 1 + 1 - 0 !
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result | 2 1 + 1 - 0 !
sql/opt_subselect.cc | 4 2 + 2 - 0 !
sql/sql_select.cc | 4 2 + 2 - 0 !
sql/sys_vars.cc | 2 1 + 1 - 0 !
storage/connect/odbconn.cpp | 2 1 + 1 - 0 !
storage/innobase/handler/ha_innodb.cc | 2 1 + 1 - 0 !
support-files/mysql.server.sh | 2 1 + 1 - 0 !
12 files changed, 24 insertions(+), 23 deletions(-)

 fix misc spelling in mariadb server repository

This is a combined patch of various spelling fixes.

* Fix misc typos in MariaDB Server

* Fix spelling of 'allows one to'

  Fix the following Lintian nags introduced in commit
  c8d040938a7ebe10e62506a726702c5990ef4dda:

  I: mariadb-backup: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-backup]
  I: mariadb-server-core: spelling-error-in-binary "allows to" "allows one to" [usr/sbin/mariadbd]
  I: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-client-test-embedded]
  I: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-test-embedded]
  I: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/test-connect-t]

* Fix typo: Enrypt->Encrypt

scripts/mysql_secure_installation.sh | 24 14 + 10 - 0 !
1 file changed, 14 insertions(+), 10 deletions(-)

 improve output from mariadb-secure-installation to be more honest

The script is not useful in Debian, and likely misleading to users.
Improve the output to be more clear about what it is doing or is not
doing.

mysql-test/mariadb-test-run.pl | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 suppress native aio warning introduced in 10.8.3

Upstream a87bb96 introduced a new warning, visible at least on all ppc64el and
s390x builds which makes the post-build mariadb-test-test fail:

    [Warning] InnoDB: native AIO failed: falling back to
    innodb_use_native_aio=OFF

The case of this is the ci environment only where there is insufficent
fs.aio-max-nr configured. A such we are adding a suppression to the
mtr only. The warning is valuable for users. Upstream MDEV-37411 has
added a io_setup as a warning, which will fail in the CI environment,
so we're pre-emptively suppressing this warning too.

Unlike upstream MariaDB, in Debian we removed libaio in for Linux on
MariaDB 10.6+ in 612630c6 and completely in 1d648d6f. This was re-added
by upstream added a system variable innodb_linux_aio to control, and
also provided automated fallback. As such we're readding it back too.

With liburing still seccomp filterer in container environments having
a libaio fallback is more valuable than the threads implementation of
last resort.

Edited & Updated: Daniel Black <daniel@mariabdb.org>

mysql-test/main/func_regexp_pcre.result | 2 1 + 1 - 0 !
mysql-test/main/func_regexp_pcre.test | 2 2 + 0 - 0 !
2 files changed, 3 insertions(+), 1 deletion(-)

 [patch] mdev-38046 make func_regexp_pcre tolerant to pcre2 offset
 change

PCRE2 10.47 reports the invalid escape in 'A\q' at offset 3 instead of 2.
Update the expected result and add a --replace_regex in the test so the
suite passes with both older and newer PCRE2 versions.

mysql-test/main/mysqld--help-aria.test | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 mdev-36668 main.mysqld--help-aria test failure when no mac address

don't use such a greedy regex_replace pattern

mysql-test/suite/innodb/t/log_file_size_online.test | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 mdev-35810 test log_file_size_online fixup

A KILL QUERY of SET GLOBAL innodb_log_file_size would sometimes lead to
ER_QUERY_INTERRUPTED being reported.

This also fixes MDEV-38287 that was visible on Launchpad.net ppc64el and
s390x builders.

mysql-test/suite/innodb/r/log_corruption_recovery.result | 2 1 + 1 - 0 !
mysql-test/suite/innodb/t/log_corruption_recovery.test | 4 2 + 2 - 0 !
2 files changed, 3 insertions(+), 3 deletions(-)

 mdev-38289: innodb.log_corruption_recovery sporadically fails

When the test is starting up the server with innodb_force_recovery=1,
there will be messages about the LSN being in the future. The current
LSN is expected to be 12338 plus any number of FILE_CHECKPOINT records
(16 bytes each). We have observed anything up to 12402=12338+16*4 in
our CI systems. To be on the safe side, let us allow up to ten records.

storage/spider/spd_table.cc | 9 7 + 2 - 0 !
1 file changed, 7 insertions(+), 2 deletions(-)

 mdev-37098 fix spider test failures in network-less environments

When running tests in environments without a network interface (such as
containers with `--network=none`), Spider could not retrieve a hardware
address to generate a node ID. This triggered a warning in the server
log, causing MTR to fail the test due to unexpected output:

    [Warning] mariadbd: Can't get hardware address with error 2

Fix this by logging Spider hardware address errors to server log only.
This ensures the message is recorded in the server log for debugging but
does not pollute the client output.

It is questionable if this is a problem at all anyway, as when
`my_gethwaddr` fails, the code zeroes out the address buffer, resulting
in a `spider_unique_id` formatted like `-000000000000-PID-`, which is
valid.

mysql-test/main/merge_alter.test | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 make the new merge_alter test indifferent to extra version info

Modify the test regex to accept any extra version info, just like it
accepts any server version info. The test is supposed to fail on actual