cmake/build_configurations/mysql_release.cmake | 12 6 6 - 0 !
1 file changed, 6 insertions( ), 6 deletions(-)

 change the default optimization from -o3 to -o2 in
 mysql_release.cmake BUILD_CONFIG profile

storage/rocksdb/build_rocksdb.cmake | 2 2 0 - 0 !
storage/rocksdb/rdb_io_watchdog.cc | 2 1 1 - 0 !
storage/rocksdb/rdb_io_watchdog.h | 12 6 6 - 0 !
storage/rocksdb/rocksdb/CMakeLists.txt | 4 3 1 - 0 !
storage/rocksdb/rocksdb/build_tools/build_detect_platform | 11 11 0 - 0 !
storage/rocksdb/rocksdb/env/env_posix.cc | 9 5 4 - 0 !
storage/rocksdb/rocksdb/port/stack_trace.cc | 2 1 1 - 0 !
7 files changed, 29 insertions( ), 13 deletions(-)

 Upstream has merged this but we still need to wait for it to be included
 in a RocksDB release and imported into MariaDB and then into Debian.

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/rocksdb/rocksdb/db/external_sst_file_ingestion_job.cc | 4 2 2 - 0 !
storage/rocksdb/rocksdb/include/rocksdb/cache.h | 2 1 1 - 0 !
2 files changed, 3 insertions( ), 3 deletions(-)

 fix various spelling errors still found in code
  Two upstream PRs remain that have been merged, but not imported on MariaDB yet.

storage/rocksdb/rocksdb/util/build_version.cc.in | 6 3 3 - 0 !
1 file changed, 3 insertions( ), 3 deletions(-)

 make rocksdb build reproducible

The RocksDB binary included a string with the build timestamp:
> rocksdb_build_git_date:@2021-05-2316:04:38@

As this changes from build to build, it makes the builds unreproducible.
Simply removing it solves the issue.

This temporary fix can be removed when a proper fix already done in upstream
lands in MariaDB when the RocksDB submodule is updated to a newer release.

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

 [patch] cmake: add support for reproducible builds
 .
 We should use relative path not absolute path.
 We can use target without breaking reproducibility.

libmariadb/man/mariadb_get_infov.3 | 4 2 2 - 0 !
libmariadb/man/mariadb_reconnect.3 | 2 1 1 - 0 !
libmariadb/man/mysql_ping.3 | 2 1 1 - 0 !
libmariadb/man/mysql_real_connect.3 | 4 2 2 - 0 !
libmariadb/man/mysql_send_query.3 | 2 1 1 - 0 !
libmariadb/man/mysql_set_character_set.3 | 2 1 1 - 0 !
libmariadb/man/mysql_stmt_error.3 | 2 1 1 - 0 !
libmariadb/man/mysql_stmt_reset.3 | 2 1 1 - 0 !
libmariadb/man/mysql_store_result.3 | 2 1 1 - 0 !
libmariadb/unittest/libmariadb/result.c | 2 1 1 - 0 !
10 files changed, 12 insertions( ), 12 deletions(-)

 [patch] fix trivial spelling errors

- handshak -> handshake
- occured -> occurred
- releated -> related
- reponse -> response
- seperated -> separated
- sucess -> success
- use use -> use

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.

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

 [patch] install pam modules and systemd units into /usr

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

cmake/build_configurations/mysql_release.cmake | 5 4 1 - 0 !
1 file changed, 4 insertions( ), 1 deletion(-)

 mariadb: ftbfs on hurd-i386: undefined reference to misc functions and files

requires https://github.com/MariaDB/server/pull/2893 as debian
explicit architectures aren't needed since dh_auto_configure handles
this.

If it works, upstream welcome.

Hurd string from uname -m, "SYSTEM processor: i686-AT386" in mariadb
output. And wiki reference https://en.wikipedia.org/wiki/Uname

client/mysql.cc | 3 3 0 - 0 !
sql/mysqld.cc | 20 15 5 - 0 !
2 files changed, 18 insertions( ), 5 deletions(-)

 [patch] 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 34
    Server version: 10.11.7-MariaDB-3 Debian n/a

    Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.
    Support MariaDB developers by giving a star at https://github.com/MariaDB/server

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

    MariaDB [(none)]>

Server output:
    [Note] Support MariaDB developers by giving a star at https://github.com/MariaDB/server

Server output if build in git directory:
    [Note] Starting MariaDB 10.11.7-MariaDB-3 source revision 219efb0a6ab0ee8ce2ec831c715783586c4db2ef as process 5426

extra/mariabackup/innobackupex.cc | 4 2 2 - 0 !
extra/mariabackup/xtrabackup.cc | 6 3 3 - 0 !
sql/opt_subselect.cc | 4 2 2 - 0 !
sql/sql_select.cc | 2 1 1 - 0 !
storage/connect/odbconn.cpp | 2 1 1 - 0 !
support-files/mysql.server.sh | 2 1 1 - 0 !
6 files changed, 10 insertions( ), 10 deletions(-)

 [patch] fix misc spelling in mariadb server repository

plugin/disks/information_schema_disks.cc | 3 3 0 - 0 !
1 file changed, 3 insertions( )

 bug#1069094: mariadb: ftbfs on hurd-i386

Define PATH_MAX if not defined.

storage/connect/ioapi.h | 5 3 2 - 0 !
1 file changed, 3 insertions( ), 2 deletions(-)

 bug#1069094: mariadb: ftbfs on hurd-i386

Add Hurd to define __USE_FILE_OFFSET64 et al.

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

 [patch] 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 dependant
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(-)

 [patch] 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.