mariadb.git
3 months agoMerge mariadb (1:11.8.3-0+deb13u1) import into refs/heads/workingbranch
Otto Kekäläinen [Tue, 26 Aug 2025 16:05:45 +0000 (09:05 -0700)]
Merge mariadb (1:11.8.3-0+deb13u1) import into refs/heads/workingbranch

3 months agoSuppress native AIO warning introduced in 10.8.3
Otto Kekäläinen [Fri, 8 Aug 2025 04:30:51 +0000 (21:30 -0700)]
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

Unlike upstream MariaDB, in Debian we removed libaio in for Linux on
MariaDB 10.6+ in 612630c6 and completely in 1d648d6f. Thus the build
will not have libaio at all on any platform in Debian, and the warning
is useless.

This might not be the optimal solution, but at least suppressing the warning
will unblock the 11.8.3 release for now.

Forwarded: https://jira.mariadb.org/browse/MDEV-37411

Gbp-Pq: Name MDEV-37411-suppress-new-warning-about-native-aio.patch

3 months agoImprove output from mariadb-secure-installation to be more honest
Otto Kekäläinen [Wed, 4 Jun 2025 11:46:31 +0000 (14:46 +0300)]
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.

Gbp-Pq: Name Improve-output-from-mariadb-secure-installation-to-be-mor.patch

3 months agoFix misc spelling in MariaDB Server repository
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name Fix-misc-spelling-in-MariaDB-Server-repository.patch

3 months agoMake compile_time_assert compatible with x32 (Closes: #1063738)
Otto Kekalainen [Thu, 4 Jul 2024 07:03:58 +0000 (00:03 -0700)]
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.

Forwarded: no

Gbp-Pq: Name 1063738-x32-compile-time-assert.patch

3 months agoDisable the 'mysql*' command deprecation warning
Otto Kekalainen [Sun, 30 Jun 2024 15:18:06 +0000 (15:18 +0000)]
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/

Forwarded: no

Gbp-Pq: Name hide-mysql-command-deprecation-warnings.patch

3 months agoShow banner in server and client startup to drive community engagement
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name startup-message.patch

3 months agoInstall PAM modules and systemd units into /usr
Michael Biebl [Mon, 22 Jan 2024 21:52:25 +0000 (22:52 +0100)]
Install PAM modules and systemd units into /usr

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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: https://github.com/MariaDB/server/pull/4065

Gbp-Pq: Name install-files-into-usr.patch

3 months agocmake: add support for reproducible buildS
Sutou Kouhei [Sat, 5 Feb 2022 02:05:39 +0000 (11:05 +0900)]
cmake: add support for reproducible buildS

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

Origin: https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927
Bug: https://github.com/mroonga/mroonga/issues/298
Forwarded: not-needed

Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch

3 months agoFix perl path in scripts
Otto Kekalainen [Sun, 20 Dec 2020 18:58:42 +0000 (20:58 +0200)]
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

Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/1718.patch
Forwarded: https://github.com/MariaDB/server/pull/1718 (rejected, will never be merged)

Gbp-Pq: Name env-perl-usr-bin-perl.patch

3 months agomariadb (1:11.8.3-0+deb13u1) trixie; urgency=medium
Otto Kekäläinen [Tue, 26 Aug 2025 16:05:45 +0000 (09:05 -0700)]
mariadb (1:11.8.3-0+deb13u1) trixie; urgency=medium

  * New upstream maintenance release 11.8.3. For details about fixes please see
    https://mariadb.com/kb/en/mariadb-11-8-3-release-notes/
  * Drop Hurd patches that are now included upstream
  * Update configuration traces to include new upstream system variables:
    - analyze-max-length (default: 4294967295)
    - innodb-linux-aio (default: auto)
  * Suppress new native AIO warning introduced in upstream a87bb96 to avoid
    mariadb-test-run failing on something that isn't a real issue
  * New upstream release includes fix for MDEV-36815 that yielded "ERROR 1267
    (HY000): Illegal mix of collations" on some systems when restarting the
    MariaDB service in Debian (Closes: #1104533)
  * Remove obsolete cleanup as upstream moved pam_mariadb_mtr.so in c05b1fe
  * Salsa CI: Remove Buster upgrades and ignore missing Trixie ones
  * Start branch debian/13-trixie for stable updates

[dgit import unpatched mariadb 1:11.8.3-0+deb13u1]

3 months agoImport mariadb_11.8.3.orig.tar.gz
Otto Kekäläinen [Tue, 26 Aug 2025 16:05:45 +0000 (09:05 -0700)]
Import mariadb_11.8.3.orig.tar.gz

[dgit import orig mariadb_11.8.3.orig.tar.gz]

3 months agoImport mariadb_11.8.3-0+deb13u1.debian.tar.xz
Otto Kekäläinen [Tue, 26 Aug 2025 16:05:45 +0000 (09:05 -0700)]
Import mariadb_11.8.3-0+deb13u1.debian.tar.xz

[dgit import tarball mariadb 1:11.8.3-0+deb13u1 mariadb_11.8.3-0+deb13u1.debian.tar.xz]

6 months agoMerge mariadb (1:11.8.2-1) import into refs/heads/workingbranch
Otto Kekäläinen [Sun, 8 Jun 2025 08:19:07 +0000 (11:19 +0300)]
Merge mariadb (1:11.8.2-1) import into refs/heads/workingbranch

6 months agoImprove output from mariadb-secure-installation to be more honest
Otto Kekäläinen [Wed, 4 Jun 2025 11:46:31 +0000 (14:46 +0300)]
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.

Gbp-Pq: Name Improve-output-from-mariadb-secure-installation-to-be-mor.patch

6 months agoFix misc spelling in MariaDB Server repository
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name Fix-misc-spelling-in-MariaDB-Server-repository.patch

6 months agoMake compile_time_assert compatible with x32 (Closes: #1063738)
Otto Kekalainen [Thu, 4 Jul 2024 07:03:58 +0000 (00:03 -0700)]
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.

Forwarded: no

Gbp-Pq: Name 1063738-x32-compile-time-assert.patch

6 months agoDisable the 'mysql*' command deprecation warning
Otto Kekalainen [Sun, 30 Jun 2024 15:18:06 +0000 (15:18 +0000)]
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/

Forwarded: no

Gbp-Pq: Name hide-mysql-command-deprecation-warnings.patch

6 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Add Hurd to define __USE_FILE_OFFSET64 et al.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-storage_connect_ioapi.h.patch

6 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Define PATH_MAX if not defined.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-plugin_disks_information_schema_disks.cc.patch

6 months agoShow banner in server and client startup to drive community engagement
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name startup-message.patch

6 months agomariadb: FTBFS on hurd-i386: undefined reference to misc functions and files requires...
Daniel Black [Mon, 29 Jan 2024 03:51:30 +0000 (19:51 -0800)]
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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006531
Forwarded: no

Gbp-Pq: Name 1006531-hurd-no-auth-socket.patch

6 months agoInstall PAM modules and systemd units into /usr
Michael Biebl [Mon, 22 Jan 2024 21:52:25 +0000 (22:52 +0100)]
Install PAM modules and systemd units into /usr

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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: https://github.com/MariaDB/server/pull/4065

Gbp-Pq: Name install-files-into-usr.patch

6 months agocmake: add support for reproducible buildS
Sutou Kouhei [Sat, 5 Feb 2022 02:05:39 +0000 (11:05 +0900)]
cmake: add support for reproducible buildS

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

Origin: https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927
Bug: https://github.com/mroonga/mroonga/issues/298
Forwarded: not-needed

Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch

6 months agoFix perl path in scripts
Otto Kekalainen [Sun, 20 Dec 2020 18:58:42 +0000 (20:58 +0200)]
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

Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/1718.patch
Forwarded: https://github.com/MariaDB/server/pull/1718 (rejected, will never be merged)

Gbp-Pq: Name env-perl-usr-bin-perl.patch

6 months agomariadb (1:11.8.2-1) unstable; urgency=medium
Otto Kekäläinen [Sun, 8 Jun 2025 08:19:07 +0000 (11:19 +0300)]
mariadb (1:11.8.2-1) unstable; urgency=medium

  * New upstream version 11.8.2, which also announces the 11.8 series now
    ready for general availability (GA) with security releases for 5 years.
    This release includes fixes for several defects as noted at
    https://mariadb.com/kb/en/mariadb-11-8-2-release-notes/ as well
    the following security issues (Closes: #1100437, #1105976):
    - CVE-2023-52969
    - CVE-2023-52970
    - CVE-2023-52971
    - CVE-2025-30693
    - CVE-2025-30722
  * Drop all RocksDB patches now upstream due to update to version 6.29fb
  * Drop PCRE2 10.45 compatibility patch obsoleted by upstream test change
  * Update configuration traces to include new upstream system variables:
    - innodb-buffer-pool-size-auto-min (default: 0)
    - innodb-buffer-pool-size-max (default: 0)
    - innodb-log-checkpoint-now (default: FALSE)
  * Also update configuration traces to match that in 11.8.2 the variables
    innodb-buffer-pool-chunk-size and innodb-log-spin-wait-delay are advertised
    as deprecated.
  * Disable new unreliable test main.mysql-interactive
  * Add Breaks/Replaces for files moved around in src:mysql-8.4 (LP: #2110378)
  * Update mariadb-server.NEWS with information about MariaDB 11.8 and
  * best practices for creating app user and allowing remote connections
  * Add patch to improve output from mariadb-secure-installation

[dgit import unpatched mariadb 1:11.8.2-1]

6 months agoImport mariadb_11.8.2.orig.tar.gz
Otto Kekäläinen [Sun, 8 Jun 2025 08:19:07 +0000 (11:19 +0300)]
Import mariadb_11.8.2.orig.tar.gz

[dgit import orig mariadb_11.8.2.orig.tar.gz]

6 months agoImport mariadb_11.8.2-1.debian.tar.xz
Otto Kekäläinen [Sun, 8 Jun 2025 08:19:07 +0000 (11:19 +0300)]
Import mariadb_11.8.2-1.debian.tar.xz

[dgit import tarball mariadb 1:11.8.2-1 mariadb_11.8.2-1.debian.tar.xz]

7 months agoMerge mariadb (1:11.8.1-4) import into refs/heads/workingbranch
Otto Kekäläinen [Wed, 23 Apr 2025 14:29:38 +0000 (07:29 -0700)]
Merge mariadb (1:11.8.1-4) import into refs/heads/workingbranch

7 months agoMDEV-36334 test main.func_format fails on i386 on exabyte/petabyte mismatch
Sergei Golubchik [Wed, 2 Apr 2025 16:06:29 +0000 (18:06 +0200)]
MDEV-36334 test main.func_format fails on i386 on exabyte/petabyte mismatch

snprintf below uses %4.2f. values above 1023.99 MiB should be shown
as 1.00 GiB not as 1024.00 MiB

(cherry picked from commit e5574d8b94681755becead56fa67c95792f83668)

Origin: upstream, https://github.com/MariaDB/server/commit/e5574d8b94681755becead56fa67c95792f83668
Bug: https://jira.mariadb.org/browse/MDEV-36334

Gbp-Pq: Name MDEV-36334-test-main.func_format-fails-on-i386-on-exabyte.patch

7 months agoMDEV-36009: Systemd: Restart on OOM
Sam Bull [Tue, 5 Nov 2024 12:44:58 +0000 (12:44 +0000)]
MDEV-36009: Systemd: Restart on OOM

Per https://github.com/systemd/systemd/issues/36529 OOM counts
as a on-abnormal condition. To ensure that MariaDB testart on
OOM the Restart is changes to on-abnormal which an extension
on the current on-abort condition.

(cherry-picked from 839828e57fdf734b15c81cb9cb76d3760a9161f1)

Closes Debian Bug#1073847.

Forwarded: https://github.com/MariaDB/server/pull/3611

Gbp-Pq: Name MDEV-36009-Systemd-Restart-on-OOM.patch

7 months agoRevert "CONC-710: Remove UDF declarations"
Georg Richter [Tue, 18 Feb 2025 15:19:50 +0000 (16:19 +0100)]
Revert "CONC-710: Remove UDF declarations"

Since UDF declarations are used  e.g. by lib_mysqludf_sys, I'm reverting
this commit. (See also CONC-757).

This reverts (mariadb-connector-c) commit 1a2ed3f67af698b394b2faed069b49d4f409a155.

Closes: Debian Bug#1101397
Forwarded: https://github.com/mariadb-corporation/mariadb-connector-c/commit/d4eec05d00ce77d2bab3848ff49d04acf0ed2cc0

Gbp-Pq: Name 1101397-revert-CONC-710.patch

7 months agofix main.timezone test for DST
Sergei Golubchik [Mon, 31 Mar 2025 09:10:12 +0000 (11:10 +0200)]
fix main.timezone test for DST

Origin: https://github.com/MariaDB/server/commit/402595f138db92a3bf7e67f30e24f682e6c3ca82.patch
Forwarded: https://github.com/MariaDB/server/commit/402595f138db92a3bf7e67f30e24f682e6c3ca82

Gbp-Pq: Name 1084293-allow-cest-in-timezone-test.patch

7 months agoFix misc spelling in MariaDB Server repository
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name Fix-misc-spelling-in-MariaDB-Server-repository.patch

7 months agoUpdate PCRE tests to fix case confusion (Closes: #1095286)
Matthew Vernon [Thu, 6 Feb 2025 14:44:19 +0000 (14:44 +0000)]
Update PCRE tests to fix case confusion (Closes: #1095286)

MariaDB RLIKE is case-insensitive; in perl the Unicode character
property tests \p{Lu} and \p{Ll} are equivalent to \p{L&} in
case-insensitive matches. So remove those tests (since there is
already the \p{L&} test).

This fixes a FTBFS with PCRE2 10.45 which fixed its handling of Ll Lt
and Lu under case-insensitive matching to match perl's behaviour.

Example of failure seen in MTR:

    main.func_regexp_pcre                    w4 [ fail ]
            Test ended at 2025-02-06 07:00:25
    CURRENT_TEST: main.func_regexp_pcre
    @@ -169,13 +169,13 @@
     \p{Latin} 㐗 0
     \p{Latin} 갷 0
     \p{Ll} 1 0
    -\p{Ll} A 0
    +\p{Ll} A 1
     \p{Ll} a 1
    -\p{Ll} À 0
    +\p{Ll} À 1
     \p{Ll} à 1
    -\p{Ll} Σ 0
    +\p{Ll} Σ 1
     \p{Ll} σ 1
    -\p{Ll} Я 0
    +\p{Ll} Я 1
     \p{Ll} я 1
     \p{Ll} ௨ 0
     \p{Ll} ප 0

Forwarded: no

Gbp-Pq: Name 1095286-pcre-tests-case-confusion.patch

7 months agoMake compile_time_assert compatible with x32 (Closes: #1063738)
Otto Kekalainen [Thu, 4 Jul 2024 07:03:58 +0000 (00:03 -0700)]
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.

Forwarded: no

Gbp-Pq: Name 1063738-x32-compile-time-assert.patch

7 months agoDisable the 'mysql*' command deprecation warning
Otto Kekalainen [Sun, 30 Jun 2024 15:18:06 +0000 (15:18 +0000)]
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/

Forwarded: no

Gbp-Pq: Name hide-mysql-command-deprecation-warnings.patch

7 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Add Hurd to define __USE_FILE_OFFSET64 et al.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-storage_connect_ioapi.h.patch

7 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Define PATH_MAX if not defined.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-plugin_disks_information_schema_disks.cc.patch

7 months agoShow banner in server and client startup to drive community engagement
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name startup-message.patch

7 months agomariadb: FTBFS on hurd-i386: undefined reference to misc functions and files requires...
Daniel Black [Mon, 29 Jan 2024 03:51:30 +0000 (19:51 -0800)]
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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006531
Forwarded: no

Gbp-Pq: Name 1006531-hurd-no-auth-socket.patch

7 months agoInstall PAM modules and systemd units into /usr
Michael Biebl [Mon, 22 Jan 2024 21:52:25 +0000 (22:52 +0100)]
Install PAM modules and systemd units into /usr

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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: no

Gbp-Pq: Name install-files-into-usr.patch

7 months agocmake: add support for reproducible buildS
Sutou Kouhei [Sat, 5 Feb 2022 02:05:39 +0000 (11:05 +0900)]
cmake: add support for reproducible buildS

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

Origin: https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927
Bug: https://github.com/mroonga/mroonga/issues/298
Forwarded: not-needed

Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch

7 months agoMake RocksDB build reproducible
Otto Kekalainen [Wed, 30 Jun 2021 04:08:05 +0000 (21:08 -0700)]
Make RocksDB build reproducible

The RocksDB binary included a string with the build timestamp:
> rocksdb_build_git_date:@2021-05-23-16: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.

Origin: https://github.com/facebook/rocksdb/commit/0a9a05ae12943b1529ef1eabbca5ce5a71c986bf
Bug: https://github.com/facebook/rocksdb/issues/7035
# Merged in RocksDB 6.19.3, but not updated into MariaDB yet

Gbp-Pq: Name fix-reproducible-builds-rocksdb.patch

7 months agoFix various spelling errors still found in code
Otto Kekalainen [Thu, 3 Mar 2022 02:13:18 +0000 (18:13 -0800)]
Fix various spelling errors still found in code

Two upstream PRs remain that have been merged, but not imported on MariaDB yet.

Forwarded: https://github.com/facebook/rocksdb/pull/9653
Origin: https://patch-diff.githubusercontent.com/raw/facebook/rocksdb/pull/9653.patch
# Merged in RocksDB 7.3.1, but not updated into MariaDB yet

Gbp-Pq: Name fix-spelling-rocksdb.patch

7 months agoFix perl path in scripts
Otto Kekalainen [Sun, 20 Dec 2020 18:58:42 +0000 (20:58 +0200)]
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

Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/1718.patch
Forwarded: https://github.com/MariaDB/server/pull/1718 (rejected, will never be merged)

Gbp-Pq: Name env-perl-usr-bin-perl.patch

7 months agorocksdb-kfreebsd
Andrew Kryczka [Wed, 17 Jun 2020 02:34:21 +0000 (19:34 -0700)]
rocksdb-kfreebsd

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.

Bug: https://jira.mariadb.org/browse/MDEV-19251
Forwarded: https://github.com/facebook/rocksdb/pull/6992
# Merged in RocksDB 6.12.6 but not updated into MariaDB yet

Gbp-Pq: Name rocksdb-kfreebsd.patch

7 months agomariadb (1:11.8.1-4) unstable; urgency=medium
Otto Kekäläinen [Wed, 23 Apr 2025 14:29:38 +0000 (07:29 -0700)]
mariadb (1:11.8.1-4) unstable; urgency=medium

  * Disable main.mysqld--help-aria test that failed on nearly every
    architecture in previous upload due to new upstream issue (MDEV-36334)
  * Disable some vector related tests that failed on sparc64 (MDEV-36670)
  * Backport main.func_format fix for exabyte/petabyte mismatch on i386

[dgit import unpatched mariadb 1:11.8.1-4]

7 months agoImport mariadb_11.8.1-4.debian.tar.xz
Otto Kekäläinen [Wed, 23 Apr 2025 14:29:38 +0000 (07:29 -0700)]
Import mariadb_11.8.1-4.debian.tar.xz

[dgit import tarball mariadb 1:11.8.1-4 mariadb_11.8.1-4.debian.tar.xz]

8 months agoMerge mariadb (1:11.8.1-2) import into refs/heads/workingbranch
Otto Kekäläinen [Thu, 20 Mar 2025 19:31:04 +0000 (12:31 -0700)]
Merge mariadb (1:11.8.1-2) import into refs/heads/workingbranch

8 months agoFix misc spelling in MariaDB Server repository
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name Fix-misc-spelling-in-MariaDB-Server-repository.patch

8 months agoUpdate PCRE tests to fix case confusion (Closes: #1095286)
Matthew Vernon [Thu, 6 Feb 2025 14:44:19 +0000 (14:44 +0000)]
Update PCRE tests to fix case confusion (Closes: #1095286)

MariaDB RLIKE is case-insensitive; in perl the Unicode character
property tests \p{Lu} and \p{Ll} are equivalent to \p{L&} in
case-insensitive matches. So remove those tests (since there is
already the \p{L&} test).

This fixes a FTBFS with PCRE2 10.45 which fixed its handling of Ll Lt
and Lu under case-insensitive matching to match perl's behaviour.

Example of failure seen in MTR:

    main.func_regexp_pcre                    w4 [ fail ]
            Test ended at 2025-02-06 07:00:25
    CURRENT_TEST: main.func_regexp_pcre
    @@ -169,13 +169,13 @@
     \p{Latin} 㐗 0
     \p{Latin} 갷 0
     \p{Ll} 1 0
    -\p{Ll} A 0
    +\p{Ll} A 1
     \p{Ll} a 1
    -\p{Ll} À 0
    +\p{Ll} À 1
     \p{Ll} à 1
    -\p{Ll} Σ 0
    +\p{Ll} Σ 1
     \p{Ll} σ 1
    -\p{Ll} Я 0
    +\p{Ll} Я 1
     \p{Ll} я 1
     \p{Ll} ௨ 0
     \p{Ll} ප 0

Forwarded: no

Gbp-Pq: Name 1095286-pcre-tests-case-confusion.patch

8 months agoMake compile_time_assert compatible with x32 (Closes: #1063738)
Otto Kekalainen [Thu, 4 Jul 2024 07:03:58 +0000 (00:03 -0700)]
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.

Forwarded: no

Gbp-Pq: Name 1063738-x32-compile-time-assert.patch

8 months agoDisable the 'mysql*' command deprecation warning
Otto Kekalainen [Sun, 30 Jun 2024 15:18:06 +0000 (15:18 +0000)]
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/

Forwarded: no

Gbp-Pq: Name hide-mysql-command-deprecation-warnings.patch

8 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Add Hurd to define __USE_FILE_OFFSET64 et al.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-storage_connect_ioapi.h.patch

8 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Define PATH_MAX if not defined.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-plugin_disks_information_schema_disks.cc.patch

8 months agoShow banner in server and client startup to drive community engagement
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name startup-message.patch

8 months agomariadb: FTBFS on hurd-i386: undefined reference to misc functions and files requires...
Daniel Black [Mon, 29 Jan 2024 03:51:30 +0000 (19:51 -0800)]
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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006531
Forwarded: no

Gbp-Pq: Name 1006531-hurd-no-auth-socket.patch

8 months agoInstall PAM modules and systemd units into /usr
Michael Biebl [Mon, 22 Jan 2024 21:52:25 +0000 (22:52 +0100)]
Install PAM modules and systemd units into /usr

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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: no

Gbp-Pq: Name install-files-into-usr.patch

8 months agocmake: add support for reproducible buildS
Sutou Kouhei [Sat, 5 Feb 2022 02:05:39 +0000 (11:05 +0900)]
cmake: add support for reproducible buildS

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

Origin: https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927
Bug: https://github.com/mroonga/mroonga/issues/298
Forwarded: not-needed

Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch

8 months agoMake RocksDB build reproducible
Otto Kekalainen [Wed, 30 Jun 2021 04:08:05 +0000 (21:08 -0700)]
Make RocksDB build reproducible

The RocksDB binary included a string with the build timestamp:
> rocksdb_build_git_date:@2021-05-23-16: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.

Origin: https://github.com/facebook/rocksdb/commit/0a9a05ae12943b1529ef1eabbca5ce5a71c986bf
Bug: https://github.com/facebook/rocksdb/issues/7035
# Merged in RocksDB 6.19.3, but not updated into MariaDB yet

Gbp-Pq: Name fix-reproducible-builds-rocksdb.patch

8 months agoFix various spelling errors still found in code
Otto Kekalainen [Thu, 3 Mar 2022 02:13:18 +0000 (18:13 -0800)]
Fix various spelling errors still found in code

Two upstream PRs remain that have been merged, but not imported on MariaDB yet.

Forwarded: https://github.com/facebook/rocksdb/pull/9653
Origin: https://patch-diff.githubusercontent.com/raw/facebook/rocksdb/pull/9653.patch
# Merged in RocksDB 7.3.1, but not updated into MariaDB yet

Gbp-Pq: Name fix-spelling-rocksdb.patch

8 months agoFix perl path in scripts
Otto Kekalainen [Sun, 20 Dec 2020 18:58:42 +0000 (20:58 +0200)]
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

Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/1718.patch
Forwarded: https://github.com/MariaDB/server/pull/1718 (rejected, will never be merged)

Gbp-Pq: Name env-perl-usr-bin-perl.patch

8 months agorocksdb-kfreebsd
Andrew Kryczka [Wed, 17 Jun 2020 02:34:21 +0000 (19:34 -0700)]
rocksdb-kfreebsd

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.

Bug: https://jira.mariadb.org/browse/MDEV-19251
Forwarded: https://github.com/facebook/rocksdb/pull/6992
# Merged in RocksDB 6.12.6 but not updated into MariaDB yet

Gbp-Pq: Name rocksdb-kfreebsd.patch

8 months agomariadb (1:11.8.1-2) unstable; urgency=medium
Otto Kekäläinen [Thu, 20 Mar 2025 19:31:04 +0000 (12:31 -0700)]
mariadb (1:11.8.1-2) unstable; urgency=medium

  * Disable test func_format on i386 (MDEV-36334) to get i386 builds
    pass on official Debian buildd while upstream fixes the issue
  * Restore better error message on service stop failures from c789cdaf
  * Revert "Set CAP_IPC_LOCK capability if possible" to follow upstream

[dgit import unpatched mariadb 1:11.8.1-2]

8 months agoImport mariadb_11.8.1-2.debian.tar.xz
Otto Kekäläinen [Thu, 20 Mar 2025 19:31:04 +0000 (12:31 -0700)]
Import mariadb_11.8.1-2.debian.tar.xz

[dgit import tarball mariadb 1:11.8.1-2 mariadb_11.8.1-2.debian.tar.xz]

9 months agoImport mariadb_11.8.1.orig.tar.gz
Otto Kekäläinen [Thu, 13 Mar 2025 20:58:11 +0000 (13:58 -0700)]
Import mariadb_11.8.1.orig.tar.gz

[dgit import orig mariadb_11.8.1.orig.tar.gz]

9 months agoMerge mariadb (1:11.4.5-1) import into refs/heads/workingbranch
Otto Kekäläinen [Wed, 19 Feb 2025 16:57:57 +0000 (08:57 -0800)]
Merge mariadb (1:11.4.5-1) import into refs/heads/workingbranch

9 months agoFix misc spelling in MariaDB Server repository
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name Fix-misc-spelling-in-MariaDB-Server-repository.patch

9 months agoUpdate PCRE tests to fix case confusion (Closes: #1095286)
Matthew Vernon [Thu, 6 Feb 2025 14:44:19 +0000 (14:44 +0000)]
Update PCRE tests to fix case confusion (Closes: #1095286)

MariaDB RLIKE is case-insensitive; in perl the Unicode character
property tests \p{Lu} and \p{Ll} are equivalent to \p{L&} in
case-insensitive matches. So remove those tests (since there is
already the \p{L&} test).

This fixes a FTBFS with PCRE2 10.45 which fixed its handling of Ll Lt
and Lu under case-insensitive matching to match perl's behaviour.

Example of failure seen in MTR:

    main.func_regexp_pcre                    w4 [ fail ]
            Test ended at 2025-02-06 07:00:25
    CURRENT_TEST: main.func_regexp_pcre
    @@ -169,13 +169,13 @@
     \p{Latin} 㐗 0
     \p{Latin} 갷 0
     \p{Ll} 1 0
    -\p{Ll} A 0
    +\p{Ll} A 1
     \p{Ll} a 1
    -\p{Ll} À 0
    +\p{Ll} À 1
     \p{Ll} à 1
    -\p{Ll} Σ 0
    +\p{Ll} Σ 1
     \p{Ll} σ 1
    -\p{Ll} Я 0
    +\p{Ll} Я 1
     \p{Ll} я 1
     \p{Ll} ௨ 0
     \p{Ll} ප 0

Forwarded: no

Gbp-Pq: Name 1095286-pcre-tests-case-confusion.patch

9 months agoMake compile_time_assert compatible with x32 (Closes: #1063738)
Otto Kekalainen [Thu, 4 Jul 2024 07:03:58 +0000 (00:03 -0700)]
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.

Forwarded: no

Gbp-Pq: Name 1063738-x32-compile-time-assert.patch

9 months agoDisable the 'mysql*' command deprecation warning
Otto Kekalainen [Sun, 30 Jun 2024 15:18:06 +0000 (15:18 +0000)]
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/

Forwarded: no

Gbp-Pq: Name hide-mysql-command-deprecation-warnings.patch

9 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Add Hurd to define __USE_FILE_OFFSET64 et al.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-storage_connect_ioapi.h.patch

9 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Define PATH_MAX if not defined.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-plugin_disks_information_schema_disks.cc.patch

9 months agoShow banner in server and client startup to drive community engagement
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name startup-message.patch

9 months agomariadb: FTBFS on hurd-i386: undefined reference to misc functions and files requires...
Daniel Black [Mon, 29 Jan 2024 03:51:30 +0000 (19:51 -0800)]
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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006531
Forwarded: no

Gbp-Pq: Name 1006531-hurd-no-auth-socket.patch

9 months agoInstall PAM modules and systemd units into /usr
Michael Biebl [Mon, 22 Jan 2024 21:52:25 +0000 (22:52 +0100)]
Install PAM modules and systemd units into /usr

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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: no

Gbp-Pq: Name install-files-into-usr.patch

9 months agocmake: add support for reproducible buildS
Sutou Kouhei [Sat, 5 Feb 2022 02:05:39 +0000 (11:05 +0900)]
cmake: add support for reproducible buildS

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

Origin: https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927
Bug: https://github.com/mroonga/mroonga/issues/298
Forwarded: not-needed

Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch

9 months agoMake RocksDB build reproducible
Otto Kekalainen [Wed, 30 Jun 2021 04:08:05 +0000 (21:08 -0700)]
Make RocksDB build reproducible

The RocksDB binary included a string with the build timestamp:
> rocksdb_build_git_date:@2021-05-23-16: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.

Origin: https://github.com/facebook/rocksdb/commit/0a9a05ae12943b1529ef1eabbca5ce5a71c986bf
Bug: https://github.com/facebook/rocksdb/issues/7035
# Merged in RocksDB 6.19.3, but not updated into MariaDB yet

Gbp-Pq: Name fix-reproducible-builds-rocksdb.patch

9 months agoFix various spelling errors still found in code
Otto Kekalainen [Thu, 3 Mar 2022 02:13:18 +0000 (18:13 -0800)]
Fix various spelling errors still found in code

Two upstream PRs remain that have been merged, but not imported on MariaDB yet.

Forwarded: https://github.com/facebook/rocksdb/pull/9653
Origin: https://patch-diff.githubusercontent.com/raw/facebook/rocksdb/pull/9653.patch
# Merged in RocksDB 7.3.1, but not updated into MariaDB yet

Gbp-Pq: Name fix-spelling-rocksdb.patch

9 months agoFix perl path in scripts
Otto Kekalainen [Sun, 20 Dec 2020 18:58:42 +0000 (20:58 +0200)]
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

Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/1718.patch
Forwarded: https://github.com/MariaDB/server/pull/1718 (rejected, will never be merged)

Gbp-Pq: Name env-perl-usr-bin-perl.patch

9 months agorocksdb-kfreebsd
Andrew Kryczka [Wed, 17 Jun 2020 02:34:21 +0000 (19:34 -0700)]
rocksdb-kfreebsd

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.

Bug: https://jira.mariadb.org/browse/MDEV-19251
Forwarded: https://github.com/facebook/rocksdb/pull/6992
# Merged in RocksDB 6.12.6 but not updated into MariaDB yet

Gbp-Pq: Name rocksdb-kfreebsd.patch

9 months agomariadb (1:11.4.5-1) unstable; urgency=medium
Otto Kekäläinen [Wed, 19 Feb 2025 16:57:57 +0000 (08:57 -0800)]
mariadb (1:11.4.5-1) unstable; urgency=medium

  [ Otto Kekäläinen ]
  * New upstream version 11.4.5. Includes fixes for several defects
    as noted at https://mariadb.com/kb/en/mariadb-11-4-5-release-notes/ as well
    the following security issues:
    - CVE-2025-21490
  * Include new packaging changes done upstream:
    - MDEV-35907: debian-start script fails when using non-standard socket path
    - MCOL-5819: Disable LTO for ColumnStore, otherwise enabled by default
    - MDEV-32686: Include ELF package notes
  * Update configuration traces to match changes done in MDEV-35785
  * Update configuration traces with new query allocator values from MDEV-35750
  * Build MariaDB RocksDB on loong64 now too
  * Fix minor typos in Debian packaging files
  * Fix broken links in d/copyright
  * Unify spelling fix patches into one, and fix spelling of Enrypt->Encrypt

  [ Matthew Vernon ]
  * Add patch to fix `main.func_regexp_pcre` failing with latest PCRE2 10.45
    due to backwards-incompatible case-sensitivity change in behavior in latest
    PCRE2 version (Closes: #1095286)

  [ Joe Bliss ]
  * Revert backticks change in commit 0300a915 to be compatible with databases
    containing hyphenated table names (LP: #2085554)

[dgit import unpatched mariadb 1:11.4.5-1]

9 months agoImport mariadb_11.4.5.orig.tar.gz
Otto Kekäläinen [Wed, 19 Feb 2025 16:57:57 +0000 (08:57 -0800)]
Import mariadb_11.4.5.orig.tar.gz

[dgit import orig mariadb_11.4.5.orig.tar.gz]

9 months agoImport mariadb_11.4.5-1.debian.tar.xz
Otto Kekäläinen [Wed, 19 Feb 2025 16:57:57 +0000 (08:57 -0800)]
Import mariadb_11.4.5-1.debian.tar.xz

[dgit import tarball mariadb 1:11.4.5-1 mariadb_11.4.5-1.debian.tar.xz]

11 months agoMerge mariadb (1:11.4.4-3) import into refs/heads/workingbranch
Otto Kekäläinen [Sun, 12 Jan 2025 22:10:40 +0000 (14:10 -0800)]
Merge mariadb (1:11.4.4-3) import into refs/heads/workingbranch

11 months agoMDEV-35785: Use same innodb_log_file_mmap description on all systems
Otto Kekäläinen [Sun, 12 Jan 2025 21:31:16 +0000 (13:31 -0800)]
MDEV-35785: Use same innodb_log_file_mmap description on all systems

On most 64-bit architectures `mariadbd --help --verbose` said:

    Whether ib_logfile0 resides in persistent memory or
    should initially be memory-mapped

On 32-bit architectures and some 64-bit (e.g. s390x) it said:

    Whether ib_logfile0 should initially be memory-mapped

Having the help test vary with the same source code build with the same
build flags and dependencies seems confusing. Unify the text to always
be the same for clarity.

Ideally the embedded help text would be the exact same first sentence
as the wiki docs[1] but use this custom text now for better clarity.

[1] https://mariadb.com/kb/en/innodb-system-variables/#innodb_log_file_mmap

Forwarded: no

Gbp-Pq: Name MDEV-35785-Use-same-innodb_log_file_mmap-description.patch

11 months ago[PATCH 1/2] MDEV-35785 innodb_log_file_mmap is not defined on 32-bit systems
Marko Mäkelä [Wed, 8 Jan 2025 10:59:28 +0000 (12:59 +0200)]
[PATCH 1/2] MDEV-35785 innodb_log_file_mmap is not defined on 32-bit systems

HAVE_INNODB_MMAP: Remove, and unconditionally enable this code.

log_mmap(): On 32-bit systems, ensure that the size fits in 32 bits.

log_t::resize_start(), log_t::resize_abort(): Only handle memory-mapping
if HAVE_PMEM is defined. The generic memory-mapped interface is only for
reading the log in recovery. Writable memory mappings are only for
persistent memory, that is, Linux file systems with mount -o dax.

Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3732.patch (9057410ec72186fe9f9d0e6a73b9754e29c00afe)
Forwarded: https://github.com/MariaDB/server/pull/3732

Gbp-Pq: Name MDEV-35785-Always-show-innodb_log_file_mmap.patch

11 months agoMDEV-35528: mariadb-binlog cannot process more than 1 logfiles when --stop-datetime...
Xiaochuan Cui [Fri, 29 Nov 2024 21:52:19 +0000 (13:52 -0800)]
MDEV-35528: mariadb-binlog cannot process more than 1 logfiles when --stop-datetime is specified

Fix regression introduced by commits 9588526 and 242b67f which attempted to
address MDEV-27037. With the regression, mariadb-binlog cannot process multiple
log files when --stop-datetime is specified.

Remove the code to set retval as OK_STOP if mariadb-binlog finished processing
current log file but not reached specified --stop-datetime or --stop-position,
to make it possible to continue process following log files.

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.

Forwarded: https://github.com/MariaDB/server/pull/3670
Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3670.patch

Gbp-Pq: Name MDEV-35528-mariadb-binlog-cannot-process-more-than-1-logf.patch

11 months agoFix spelling of 'allows one to'
Otto Kekäläinen [Mon, 4 Nov 2024 16:00:42 +0000 (08:00 -0800)]
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]

Forwarded: no

Gbp-Pq: Name Fix-spelling-of-of-allows-one-to.patch

11 months agoMake compile_time_assert compatible with x32 (Closes: #1063738)
Otto Kekalainen [Thu, 4 Jul 2024 07:03:58 +0000 (00:03 -0700)]
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.

Forwarded: no

Gbp-Pq: Name 1063738-x32-compile-time-assert.patch

11 months agoDisable the 'mysql*' command deprecation warning
Otto Kekalainen [Sun, 30 Jun 2024 15:18:06 +0000 (15:18 +0000)]
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/

Forwarded: no

Gbp-Pq: Name hide-mysql-command-deprecation-warnings.patch

11 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Add Hurd to define __USE_FILE_OFFSET64 et al.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-storage_connect_ioapi.h.patch

11 months agoBug#1069094: mariadb: FTBFS on hurd-i386
Svante Signell [Sat, 20 Apr 2024 23:51:00 +0000 (16:51 -0700)]
Bug#1069094: mariadb: FTBFS on hurd-i386

Define PATH_MAX if not defined.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
Forwarded: no

Gbp-Pq: Name hurd-i386-plugin_disks_information_schema_disks.cc.patch

11 months agoFix misc spelling in MariaDB Server repository
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
Fix misc spelling in MariaDB Server repository

Forwarded: no

Gbp-Pq: Name fix-spelling-mariadb.patch

11 months agoShow banner in server and client startup to drive community engagement
Otto Kekalainen [Sun, 10 Mar 2024 16:56:13 +0000 (16:56 +0000)]
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

Forwarded: no

Gbp-Pq: Name startup-message.patch

11 months agomariadb: FTBFS on hurd-i386: undefined reference to misc functions and files requires...
Daniel Black [Mon, 29 Jan 2024 03:51:30 +0000 (19:51 -0800)]
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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006531
Forwarded: no

Gbp-Pq: Name 1006531-hurd-no-auth-socket.patch

11 months ago[PATCH] Install PAM modules and systemd units into /usr
Michael Biebl [Mon, 22 Jan 2024 21:52:25 +0000 (22:52 +0100)]
[PATCH] Install PAM modules and systemd units into /usr

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

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: no

Gbp-Pq: Name install-files-into-usr.patch

11 months agocmake: add support for reproducible buildS
Sutou Kouhei [Sat, 5 Feb 2022 02:05:39 +0000 (11:05 +0900)]
cmake: add support for reproducible buildS

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

Origin: https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927
Bug: https://github.com/mroonga/mroonga/issues/298
Forwarded: not-needed

Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch

11 months agoMake RocksDB build reproducible
Otto Kekalainen [Wed, 30 Jun 2021 04:08:05 +0000 (21:08 -0700)]
Make RocksDB build reproducible

The RocksDB binary included a string with the build timestamp:
> rocksdb_build_git_date:@2021-05-23-16: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.

Origin: https://github.com/facebook/rocksdb/commit/0a9a05ae12943b1529ef1eabbca5ce5a71c986bf
Bug: https://github.com/facebook/rocksdb/issues/7035
# Merged in RocksDB 6.19.3, but not updated into MariaDB yet

Gbp-Pq: Name fix-reproducible-builds-rocksdb.patch