diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 13:24:22 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 13:28:53 +0000 |
| commit | a2f41c7df0986cc7a79a5b6ffcd70ffb78e6e105 (patch) | |
| tree | c26ad120ea2a32b79ce49ec5535f9888724e1b7f /debian | |
| parent | Merging upstream version 1:10.11.8. (diff) | |
| download | mariadb-a2f41c7df0986cc7a79a5b6ffcd70ffb78e6e105.tar.xz mariadb-a2f41c7df0986cc7a79a5b6ffcd70ffb78e6e105.zip | |
Merging debian version 1:10.11.8-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
33 files changed, 1141 insertions, 988 deletions
diff --git a/debian/README.Contributor b/debian/README.Contributor index 45708b52..bf8505b7 100644 --- a/debian/README.Contributor +++ b/debian/README.Contributor @@ -142,7 +142,7 @@ https://salsa.debian.org/mariadb-team/mariadb-server/-/commit/7972a38e Ensure most packaging files are formatted correctly: - wrap-and-sort -av + wrap-and-sort -vast Check man pages for syntax errors: diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh index 57050057..f6929f7c 100755 --- a/debian/additions/debian-start.inc.sh +++ b/debian/additions/debian-start.inc.sh @@ -36,8 +36,8 @@ function check_for_crashed_tables() { SELECT CONCAT("select count(*) into @discard from '\''", TABLE_SCHEMA, "'\''.'\''", TABLE_NAME, "'\''") FROM information_schema.TABLES WHERE TABLE_SCHEMA<>"INFORMATION_SCHEMA" AND TABLE_SCHEMA<>"PERFORMANCE_SCHEMA" AND (ENGINE="MyISAM" OR ENGINE="Aria") - ' | \ - $MARIADB --skip-column-names --batch | \ + ' | + $MARIADB --skip-column-names --batch | xargs -i $MARIADB --skip-column-names --silent --batch --force -e "{}" &> "${tempfile}" set -e diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 6d5595ec..e0de8cce 100755 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -469,7 +469,7 @@ sub parse_status_text { # too many locks to print, the output might be truncated) my $time_text; - if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) { + if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10|11\.[0-9]\./) ) { ( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-fx]* INNODB MONITOR OUTPUT/m; $innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ]; } else { @@ -640,7 +640,7 @@ sub parse_fk_section { return 0 unless $fulltext; my ( $ts, $type ); - if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[0-9]\./) ) { + if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10|11.[0-9]\./) ) { ( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-fx]*\s+(\w+)/m; $section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ]; } else { @@ -901,7 +901,7 @@ sub parse_dl_section { my ( $ts ) = $fulltext =~ m/^$s$/m; return 0 unless $ts; - if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) { + if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10|11\.[0-9]\./) ) { $dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ]; } else { diff --git a/debian/changelog b/debian/changelog index e709a196..eb4052ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +mariadb (1:10.11.8-1) unstable; urgency=medium + + [ Otto Kekäläinen ] + * New upstream version 10.11.8. Includes fixes for several severe regressions + as noted at https://mariadb.com/kb/en/mariadb-10-11-8-release-notes/ as well + as security issues: + - CVE-2024-21096 + * Add CMake flag to ignore libfmt exit code so cross-building works + * Extend skip test list for latest failures in reproducible builds on armhf + * Disable tests that fail on armhf when full test suite is run + * Remove temporary exceptions for bugs that should by now be fixed + * MDEV-31530 Localizations for Swahili language + * Update Innotop to be compatible with MariaDB 11.x series + * Replace use of trailing line `| \` with just `|` in Bash scripts + * Remove libmariadb file no longer present in MariaDB Connector C v3.3 + * Replace autopkgtest smoke test dependency hack with arch list + * Update client program 'mariadb' trace to match new libmariadb v3.3 + - New parameter 'sandbox' to fix a vulnerability and new mariadb-dump + output that always has the sandbox header and is backwards incompatible + * Update server trace to include new parameters innodb-log-spin-wait-delay + and innodb-snapshot-isolation + [ Michael Biebl ] + * Ensure debconf database is purged after it has been used in postrm + + [ Svante Signell ] + * Make hurd-i386 build fully pass (Closes: #1069094) + + + -- Otto Kekäläinen <otto@debian.org> Thu, 16 May 2024 22:02:04 -0700 + mariadb (1:10.11.7-4~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index cd1ff240..78f9201e 100644 --- a/debian/control +++ b/debian/control @@ -4,48 +4,50 @@ Priority: optional Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org> XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org> XSBC-Original-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org> -XSBC-Original-Uploaders: Otto Kekäläinen <otto@debian.org> +XSBC-Original-Uploaders: + Otto Kekäläinen <otto@debian.org>, Bugs: mailto:maintainers@lists.progress-linux.org -Build-Depends: bison, - cmake, - cracklib-runtime <!nocheck>, - debhelper-compat (= 13), - debhelper (>= 13.13~), - dh-exec, - gdb <!nocheck>, - libboost-dev, - libbz2-dev, - libcrack2-dev (>= 2.9.0), - libcurl4-openssl-dev | libcurl4-dev, - libedit-dev, - libedit-dev:native, - libfmt-dev (>= 7.0.0), - libjemalloc-dev [linux-any], - libjudy-dev, - libkrb5-dev, - liblz4-dev, - liblzma-dev, - liblzo2-dev, - libncurses-dev, - libnuma-dev [linux-any], - libpam0g-dev, - libpcre2-dev, - libpmem-dev [amd64 arm64 ppc64el riscv64], - libsnappy-dev, - libssl-dev, - libssl-dev:native, - libsystemd-dev [linux-any], - liburing-dev [linux-any], - libxml2-dev, - libzstd-dev (>= 1.3.3), - lsb-release, - perl:any, - po-debconf, - psmisc, - unixodbc-dev, - uuid-dev, - zlib1g-dev (>= 1:1.1.3-5~), - zlib1g-dev:native +Build-Depends: + bison, + cmake, + cracklib-runtime <!nocheck>, + debhelper-compat (= 13), + debhelper (>= 13.13~), + dh-exec, + gdb <!nocheck>, + libboost-dev, + libbz2-dev, + libcrack2-dev (>= 2.9.0), + libcurl4-openssl-dev | libcurl4-dev, + libedit-dev, + libedit-dev:native, + libfmt-dev (>= 10.2.2) | libfmt-dev (<< 10), + libjemalloc-dev [linux-any], + libjudy-dev, + libkrb5-dev, + liblz4-dev, + liblzma-dev, + liblzo2-dev, + libncurses-dev, + libnuma-dev [linux-any], + libpam0g-dev, + libpcre2-dev, + libpmem-dev [amd64 arm64 ppc64el riscv64], + libsnappy-dev, + libssl-dev, + libssl-dev:native, + libsystemd-dev [linux-any], + liburing-dev [linux-any], + libxml2-dev, + libzstd-dev (>= 1.3.3), + lsb-release, + perl:any, + po-debconf, + psmisc, + unixodbc-dev, + uuid-dev, + zlib1g-dev (>= 1:1.1.3-5~), + zlib1g-dev:native, Rules-Requires-Root: no Standards-Version: 4.6.2 Homepage: https://mariadb.org/ @@ -57,23 +59,27 @@ XSBC-Original-Vcs-Git: https://salsa.debian.org/mariadb-team/mariadb-server.git Package: libmariadb-dev Architecture: any Section: libdevel -Depends: libmariadb3 (= ${binary:Version}), - libssl-dev, - zlib1g-dev, - ${misc:Depends}, - ${shlibs:Depends} -Breaks: libmariadb-client-lgpl-dev, - libmariadb-dev-compat (<< ${source:Version}), - libmariadbclient-dev (<< 1:10.3), - libmysqlclient-dev, - libmysqld-dev (<< ${source:Version}) -Replaces: libmariadb-client-lgpl-dev, - libmariadb-dev-compat (<< ${source:Version}), - libmariadbclient-dev (<< 1:10.3), - libmysqlclient-dev, - libmysqld-dev (<< ${source:Version}) -Conflicts: libmariadbclient16-dev, - libmysqlclient-dev +Depends: + libmariadb3 (= ${binary:Version}), + libssl-dev, + zlib1g-dev, + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + libmariadb-client-lgpl-dev, + libmariadb-dev-compat (<< ${source:Version}), + libmariadbclient-dev (<< 1:10.3), + libmysqlclient-dev, + libmysqld-dev (<< ${source:Version}), +Replaces: + libmariadb-client-lgpl-dev, + libmariadb-dev-compat (<< ${source:Version}), + libmariadbclient-dev (<< 1:10.3), + libmysqlclient-dev, + libmysqld-dev (<< ${source:Version}), +Conflicts: + libmariadbclient16-dev, + libmysqlclient-dev, Description: MariaDB database development files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -87,21 +93,26 @@ Description: MariaDB database development files Package: libmariadb-dev-compat Architecture: any Section: libdevel -Depends: libmariadb-dev (= ${binary:Version}), - ${misc:Depends} -Conflicts: libmariadb-client-lgpl-dev-compat, - libmariadbclient-dev-compat, - libmysqlclient-dev -Provides: libmariadb-client-lgpl-dev-compat, - libmariadbclient-dev-compat -Breaks: libmariadb-client-lgpl-dev-compat, - libmariadbclient-dev (<< 1:10.3), - libmariadbclient-dev-compat, - libmysqlclient-dev -Replaces: libmariadb-client-lgpl-dev-compat, - libmariadbclient-dev (<< 1:10.3), - libmariadbclient-dev-compat, - libmysqlclient-dev +Depends: + libmariadb-dev (= ${binary:Version}), + ${misc:Depends}, +Conflicts: + libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev-compat, + libmysqlclient-dev, +Provides: + libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev-compat, +Breaks: + libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev (<< 1:10.3), + libmariadbclient-dev-compat, + libmysqlclient-dev, +Replaces: + libmariadb-client-lgpl-dev-compat, + libmariadbclient-dev (<< 1:10.3), + libmariadbclient-dev-compat, + libmysqlclient-dev, Description: MariaDB Connector/C, compatibility symlinks MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -115,18 +126,22 @@ Package: libmariadb3 Architecture: any Multi-Arch: same Section: libs -Depends: mariadb-common, - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: mariadb-galera-server-10.0, - mariadb-galera-server-5.5, - mariadb-server-10.0, - mariadb-server-5.1, - mariadb-server-5.2, - mariadb-server-5.3, - mariadb-server-5.5 -Breaks: libmariadbclient18 -Replaces: libmariadbclient18 +Depends: + mariadb-common, + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + mariadb-galera-server-10.0, + mariadb-galera-server-5.5, + mariadb-server-10.0, + mariadb-server-5.1, + mariadb-server-5.2, + mariadb-server-5.3, + mariadb-server-5.5, +Breaks: + libmariadbclient18, +Replaces: + libmariadbclient18, Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -138,8 +153,9 @@ Description: MariaDB database client library Package: libmariadbd19 Architecture: any Section: libs -Depends: ${misc:Depends}, - ${shlibs:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends}, Multi-Arch: same Description: MariaDB embedded database, shared library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database @@ -152,16 +168,21 @@ Description: MariaDB embedded database, shared library Package: libmariadbd-dev Architecture: any Section: libdevel -Provides: libmysqld-dev -Pre-Depends: ${misc:Pre-Depends} -Depends: libmariadb-dev (= ${binary:Version}), - libmariadbd19 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Breaks: libmariadb-dev (<< 1:10.4), - libmysqld-dev -Replaces: libmariadb-dev (<< 1:10.4), - libmysqld-dev +Provides: + libmysqld-dev, +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + libmariadb-dev (= ${binary:Version}), + libmariadbd19 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + libmariadb-dev (<< 1:10.4), + libmysqld-dev, +Replaces: + libmariadb-dev (<< 1:10.4), + libmysqld-dev, Description: MariaDB embedded database, development files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -173,8 +194,9 @@ Description: MariaDB embedded database, development files Package: mariadb-common Architecture: all -Depends: mysql-common (>= 5.6.25), - ${misc:Depends} +Depends: + mysql-common (>= 5.6.25), + ${misc:Depends}, Multi-Arch: foreign Description: MariaDB database common config files (/etc/mysql/mariadb.conf.d/) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database @@ -186,79 +208,84 @@ Description: MariaDB database common config files (/etc/mysql/mariadb.conf.d/) Package: mariadb-client-core Architecture: any -Depends: libmariadb3 (>= 10.5.4), - mariadb-common (>= ${source:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: mysql-client-5.5, - mysql-client-5.6, - mysql-client-5.7, - mysql-client-8.0, - virtual-mysql-client-core -Breaks: mariadb-client-10.0, - mariadb-client-core-10.0, - mariadb-client-core-10.1, - mariadb-client-core-10.2, - mariadb-client-core-10.3, - mariadb-client-core-10.4, - mariadb-client-core-10.5, - mariadb-client-core-10.6, - mariadb-client-core-5.5, - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-core (<< ${source:Version}), - mariadb-server-core-10.3, - mariadb-server-core-10.4, - mariadb-server-core-10.5, - mariadb-server-core-10.6, - mysql-client-core-5.5, - mysql-client-core-5.6, - mysql-client-core-5.7, - mysql-client-core-8.0, - mysql-cluster-community-client-plugins, - mysql-server-core-5.5, - mysql-server-core-5.6, - mysql-server-core-5.7, - mysql-server-core-8.0, - percona-server-server-5.6, - percona-server-server-5.7, - percona-server-server-8.0, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7, - percona-xtradb-cluster-server-8.0 -Replaces: mariadb-client-10.0, - mariadb-client-core-10.0, - mariadb-client-core-10.1, - mariadb-client-core-10.2, - mariadb-client-core-10.3, - mariadb-client-core-10.4, - mariadb-client-core-10.5, - mariadb-client-core-10.6, - mariadb-client-core-5.5, - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-core (<< ${source:Version}), - mariadb-server-core-10.3, - mariadb-server-core-10.4, - mariadb-server-core-10.5, - mariadb-server-core-10.6, - mysql-client-core-5.5, - mysql-client-core-5.6, - mysql-client-core-5.7, - mysql-client-core-8.0, - mysql-cluster-community-client-plugins, - mysql-server-core-5.5, - mysql-server-core-5.6, - mysql-server-core-5.7, - mysql-server-core-8.0, - percona-server-server-5.6, - percona-server-server-5.7, - percona-server-server-8.0, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7, - percona-xtradb-cluster-server-8.0, - virtual-mysql-client-core -Provides: virtual-mysql-client-core +Depends: + libmariadb3 (>= 10.5.4), + mariadb-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + mysql-client-5.5, + mysql-client-5.6, + mysql-client-5.7, + mysql-client-8.0, + virtual-mysql-client-core, +Breaks: + mariadb-client-10.0, + mariadb-client-core-10.0, + mariadb-client-core-10.1, + mariadb-client-core-10.2, + mariadb-client-core-10.3, + mariadb-client-core-10.4, + mariadb-client-core-10.5, + mariadb-client-core-10.6, + mariadb-client-core-5.5, + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-core (<< ${source:Version}), + mariadb-server-core-10.3, + mariadb-server-core-10.4, + mariadb-server-core-10.5, + mariadb-server-core-10.6, + mysql-client-core-5.5, + mysql-client-core-5.6, + mysql-client-core-5.7, + mysql-client-core-8.0, + mysql-cluster-community-client-plugins, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-server-core-5.7, + mysql-server-core-8.0, + percona-server-server-5.6, + percona-server-server-5.7, + percona-server-server-8.0, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, + percona-xtradb-cluster-server-8.0, +Replaces: + mariadb-client-10.0, + mariadb-client-core-10.0, + mariadb-client-core-10.1, + mariadb-client-core-10.2, + mariadb-client-core-10.3, + mariadb-client-core-10.4, + mariadb-client-core-10.5, + mariadb-client-core-10.6, + mariadb-client-core-5.5, + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-core (<< ${source:Version}), + mariadb-server-core-10.3, + mariadb-server-core-10.4, + mariadb-server-core-10.5, + mariadb-server-core-10.6, + mysql-client-core-5.5, + mysql-client-core-5.6, + mysql-client-core-5.7, + mysql-client-core-8.0, + mysql-cluster-community-client-plugins, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-server-core-5.7, + mysql-server-core-8.0, + percona-server-server-5.6, + percona-server-server-5.7, + percona-server-server-8.0, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, + percona-xtradb-cluster-server-8.0, + virtual-mysql-client-core, +Provides: + virtual-mysql-client-core, Description: MariaDB database core client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -269,92 +296,98 @@ Description: MariaDB database core client binaries Package: mariadb-client Architecture: any -Depends: debianutils (>=1.6), - libconfig-inifiles-perl, - mariadb-client-core (>= ${source:Version}), - ${misc:Depends}, - ${perl:Depends}, - ${shlibs:Depends} -Conflicts: mysql-client-core-5.5, - mysql-client-core-5.6, - mysql-client-core-5.7, - mysql-client-core-8.0, - mytop, - virtual-mysql-client -Breaks: mariadb-client-10.0, - mariadb-client-10.1, - mariadb-client-10.2, - mariadb-client-10.3, - mariadb-client-10.4, - mariadb-client-10.5, - mariadb-client-10.6, - mariadb-client-5.5, - mariadb-client-core (<< ${source:Version}), - mariadb-client-core-10.0, - mariadb-client-core-10.1, - mariadb-client-core-10.2, - mariadb-client-core-10.3, - mariadb-client-core-10.4, - mariadb-client-core-10.5, - mariadb-client-core-10.6, - mariadb-server (<< ${source:Version}), - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-10.2, - mariadb-server-10.3, - mariadb-server-10.4, - mariadb-server-10.5 (<< 1:10.11), - mariadb-server-10.6, - mysql-client-5.5, - mysql-client-5.6, - mysql-client-5.7, - mysql-client-8.0, - mysql-server-5.5, - mysql-server-5.7, - mysql-server-core-8.0, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7 -Replaces: mariadb-client-10.0, - mariadb-client-10.1, - mariadb-client-10.2, - mariadb-client-10.3, - mariadb-client-10.4, - mariadb-client-10.5, - mariadb-client-10.6, - mariadb-client-5.5, - mariadb-client-core (<< ${source:Version}), - mariadb-client-core-10.0, - mariadb-client-core-10.1, - mariadb-client-core-10.2, - mariadb-client-core-10.3, - mariadb-client-core-10.4, - mariadb-client-core-10.5, - mariadb-client-core-10.6, - mariadb-server (<< ${source:Version}), - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-10.2, - mariadb-server-10.3, - mariadb-server-10.4, - mariadb-server-10.5 (<< 1:10.11), - mariadb-server-10.6, - mysql-client-5.5, - mysql-client-5.6, - mysql-client-5.7, - mysql-client-8.0, - mysql-server-5.5, - mysql-server-5.7, - mysql-server-core-8.0, - mytop, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7, - virtual-mysql-client -Provides: virtual-mysql-client -Recommends: libdbd-mariadb-perl | libdbd-mysql-perl, - libdbi-perl, - libterm-readkey-perl +Depends: + debianutils (>=1.6), + libconfig-inifiles-perl, + mariadb-client-core (>= ${source:Version}), + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends}, +Conflicts: + mysql-client-core-5.5, + mysql-client-core-5.6, + mysql-client-core-5.7, + mysql-client-core-8.0, + mytop, + virtual-mysql-client, +Breaks: + mariadb-client-10.0, + mariadb-client-10.1, + mariadb-client-10.2, + mariadb-client-10.3, + mariadb-client-10.4, + mariadb-client-10.5, + mariadb-client-10.6, + mariadb-client-5.5, + mariadb-client-core (<< ${source:Version}), + mariadb-client-core-10.0, + mariadb-client-core-10.1, + mariadb-client-core-10.2, + mariadb-client-core-10.3, + mariadb-client-core-10.4, + mariadb-client-core-10.5, + mariadb-client-core-10.6, + mariadb-server (<< ${source:Version}), + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2, + mariadb-server-10.3, + mariadb-server-10.4, + mariadb-server-10.5 (<< 1:10.11), + mariadb-server-10.6, + mysql-client-5.5, + mysql-client-5.6, + mysql-client-5.7, + mysql-client-8.0, + mysql-server-5.5, + mysql-server-5.7, + mysql-server-core-8.0, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, +Replaces: + mariadb-client-10.0, + mariadb-client-10.1, + mariadb-client-10.2, + mariadb-client-10.3, + mariadb-client-10.4, + mariadb-client-10.5, + mariadb-client-10.6, + mariadb-client-5.5, + mariadb-client-core (<< ${source:Version}), + mariadb-client-core-10.0, + mariadb-client-core-10.1, + mariadb-client-core-10.2, + mariadb-client-core-10.3, + mariadb-client-core-10.4, + mariadb-client-core-10.5, + mariadb-client-core-10.6, + mariadb-server (<< ${source:Version}), + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2, + mariadb-server-10.3, + mariadb-server-10.4, + mariadb-server-10.5 (<< 1:10.11), + mariadb-server-10.6, + mysql-client-5.5, + mysql-client-5.6, + mysql-client-5.7, + mysql-client-8.0, + mysql-server-5.5, + mysql-server-5.7, + mysql-server-core-8.0, + mytop, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, + virtual-mysql-client, +Provides: + virtual-mysql-client, +Recommends: + libdbd-mariadb-perl | libdbd-mysql-perl, + libdbi-perl, + libterm-readkey-perl, Description: MariaDB database client binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -366,69 +399,74 @@ Description: MariaDB database client binaries Package: mariadb-server-core Architecture: any -Depends: mariadb-common (>= ${source:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: mariadb-galera-server-5.5, - mysql-server-5.5, - mysql-server-5.6, - mysql-server-5.7, - mysql-server-8.0, - virtual-mysql-server-core -Breaks: mariadb-client-10.1, - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-10.2, - mariadb-server-10.3, - mariadb-server-10.4, - mariadb-server-10.5 (<< 1:10.11), - mariadb-server-core-10.0, - mariadb-server-core-10.1, - mariadb-server-core-10.2, - mariadb-server-core-10.3, - mariadb-server-core-10.4, - mariadb-server-core-10.5, - mariadb-server-core-10.6, - mariadb-server-core-5.5, - mysql-client-5.5, - mysql-client-5.6, - mysql-server-core-5.5, - mysql-server-core-5.6, - mysql-server-core-5.7, - mysql-server-core-8.0, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7 -Replaces: mariadb-client-10.1, - mariadb-server (<< ${source:Version}), - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-10.2, - mariadb-server-10.3, - mariadb-server-10.4, - mariadb-server-10.5 (<< 1:10.11), - mariadb-server-10.6, - mariadb-server-core-10.0, - mariadb-server-core-10.1, - mariadb-server-core-10.2, - mariadb-server-core-10.3, - mariadb-server-core-10.4, - mariadb-server-core-10.5, - mariadb-server-core-10.6, - mariadb-server-core-5.5, - mysql-client-5.5, - mysql-client-5.6, - mysql-client-5.7, - mysql-client-8.0, - mysql-server-core-5.5, - mysql-server-core-5.6, - mysql-server-core-5.7, - mysql-server-core-8.0, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7, - virtual-mysql-server-core -Provides: virtual-mysql-server-core +Depends: + mariadb-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + mariadb-galera-server-5.5, + mysql-server-5.5, + mysql-server-5.6, + mysql-server-5.7, + mysql-server-8.0, + virtual-mysql-server-core, +Breaks: + mariadb-client-10.1, + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2, + mariadb-server-10.3, + mariadb-server-10.4, + mariadb-server-10.5 (<< 1:10.11), + mariadb-server-core-10.0, + mariadb-server-core-10.1, + mariadb-server-core-10.2, + mariadb-server-core-10.3, + mariadb-server-core-10.4, + mariadb-server-core-10.5, + mariadb-server-core-10.6, + mariadb-server-core-5.5, + mysql-client-5.5, + mysql-client-5.6, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-server-core-5.7, + mysql-server-core-8.0, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, +Replaces: + mariadb-client-10.1, + mariadb-server (<< ${source:Version}), + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2, + mariadb-server-10.3, + mariadb-server-10.4, + mariadb-server-10.5 (<< 1:10.11), + mariadb-server-10.6, + mariadb-server-core-10.0, + mariadb-server-core-10.1, + mariadb-server-core-10.2, + mariadb-server-core-10.3, + mariadb-server-core-10.4, + mariadb-server-core-10.5, + mariadb-server-core-10.6, + mariadb-server-core-5.5, + mysql-client-5.5, + mysql-client-5.6, + mysql-client-5.7, + mysql-client-8.0, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-server-core-5.7, + mysql-server-core-8.0, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, + virtual-mysql-server-core, +Provides: + virtual-mysql-server-core, Description: MariaDB database core server files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -439,98 +477,106 @@ Description: MariaDB database core server files Package: mariadb-server Architecture: any -Suggests: mailx, - mariadb-test, - netcat-openbsd -Recommends: libhtml-template-perl, - mariadb-plugin-provider-bzip2, - mariadb-plugin-provider-lz4, - mariadb-plugin-provider-lzma, - mariadb-plugin-provider-lzo, - mariadb-plugin-provider-snappy, - pv -Pre-Depends: adduser (>= 3.40), - debconf, - mariadb-common (>= ${source:Version}), - ${misc:Pre-Depends} -Depends: galera-4 (>= 26.4), - gawk, - iproute2 [linux-any], - libdbi-perl, - lsof [linux-any], - mariadb-client (>= ${source:Version}), - mariadb-server-core (>= ${server:Version}), - passwd, - perl (>= 5.6), - procps, - psmisc, - rsync, - socat, - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: handlersocket-mysql-5.5, - mariadb-tokudb-engine-10.0, - mariadb-tokudb-engine-10.1, - mariadb-tokudb-engine-5.5, - mysql-server-core-5.5, - mysql-server-core-5.6, - mysql-server-core-5.7, - mysql-server-core-8.0, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7, - virtual-mysql-server -Breaks: cqrlog (<< 1.9.0-5~), - galera-3 (<< 26.4), - handlersocket-mysql-5.5, - mariadb-galera-server, - mariadb-galera-server-10.0, - mariadb-galera-server-5.5, - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-10.2, - mariadb-server-10.3, - mariadb-server-10.4, - mariadb-server-10.5 (<< 1:10.11), - mariadb-server-10.6, - mariadb-server-5.5, - mariadb-tokudb-engine-10.0, - mariadb-tokudb-engine-10.1, - mariadb-tokudb-engine-5.5, - mysql-client-5.5, - mysql-client-5.7, - mysql-client-core-8.0, - mysql-server-5.5, - mysql-server-5.6, - mysql-server-5.7, - mysql-server-8.0 -Replaces: handlersocket-mysql-5.5, - mariadb-galera-server, - mariadb-galera-server-10.0, - mariadb-galera-server-5.5, - mariadb-server-10.0, - mariadb-server-10.1, - mariadb-server-10.2, - mariadb-server-10.3, - mariadb-server-10.4, - mariadb-server-10.5 (<< 1:10.11), - mariadb-server-10.6, - mariadb-server-5.5, - mariadb-tokudb-engine-10.0, - mariadb-tokudb-engine-10.1, - mariadb-tokudb-engine-5.5, - mysql-client-5.5, - mysql-client-5.7, - mysql-client-core-8.0, - mysql-server-5.5, - mysql-server-5.6, - mysql-server-5.7, - mysql-server-8.0, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7, - virtual-mysql-server -Provides: virtual-mysql-server +Suggests: + mailx, + mariadb-test, + netcat-openbsd, +Recommends: + libhtml-template-perl, + mariadb-plugin-provider-bzip2, + mariadb-plugin-provider-lz4, + mariadb-plugin-provider-lzma, + mariadb-plugin-provider-lzo, + mariadb-plugin-provider-snappy, + pv, +Pre-Depends: + adduser (>= 3.40), + debconf, + mariadb-common (>= ${source:Version}), + ${misc:Pre-Depends}, +Depends: + galera-4 (>= 26.4), + gawk, + iproute2 [linux-any], + libdbi-perl, + lsof [linux-any], + mariadb-client (>= ${source:Version}), + mariadb-server-core (>= ${server:Version}), + passwd, + perl (>= 5.6), + procps, + psmisc, + rsync, + socat, + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + handlersocket-mysql-5.5, + mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-10.1, + mariadb-tokudb-engine-5.5, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-server-core-5.7, + mysql-server-core-8.0, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, + virtual-mysql-server, +Breaks: + cqrlog (<< 1.9.0-5~), + galera-3 (<< 26.4), + handlersocket-mysql-5.5, + mariadb-galera-server, + mariadb-galera-server-10.0, + mariadb-galera-server-5.5, + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2, + mariadb-server-10.3, + mariadb-server-10.4, + mariadb-server-10.5 (<< 1:10.11), + mariadb-server-10.6, + mariadb-server-5.5, + mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-10.1, + mariadb-tokudb-engine-5.5, + mysql-client-5.5, + mysql-client-5.7, + mysql-client-core-8.0, + mysql-server-5.5, + mysql-server-5.6, + mysql-server-5.7, + mysql-server-8.0, +Replaces: + handlersocket-mysql-5.5, + mariadb-galera-server, + mariadb-galera-server-10.0, + mariadb-galera-server-5.5, + mariadb-server-10.0, + mariadb-server-10.1, + mariadb-server-10.2, + mariadb-server-10.3, + mariadb-server-10.4, + mariadb-server-10.5 (<< 1:10.11), + mariadb-server-10.6, + mariadb-server-5.5, + mariadb-tokudb-engine-10.0, + mariadb-tokudb-engine-10.1, + mariadb-tokudb-engine-5.5, + mysql-client-5.5, + mysql-client-5.7, + mysql-client-core-8.0, + mysql-server-5.5, + mysql-server-5.6, + mysql-server-5.7, + mysql-server-8.0, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, + virtual-mysql-server, +Provides: + virtual-mysql-server, Description: MariaDB database server binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -541,9 +587,10 @@ Description: MariaDB database server binaries Package: mariadb-server-10.5 Architecture: any -Depends: mariadb-server (>= 1:10.11), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server (>= 1:10.11), + ${misc:Depends}, + ${shlibs:Depends}, Description: MariaDB database server binaries (transitional dummy package) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -555,17 +602,20 @@ Description: MariaDB database server binaries (transitional dummy package) Package: mariadb-backup Architecture: any -Breaks: mariadb-backup-10.1, - mariadb-backup-10.2, - mariadb-backup-10.3, - mariadb-client-10.1 -Replaces: mariadb-backup-10.1, - mariadb-backup-10.2, - mariadb-backup-10.3, - mariadb-client-10.1 -Depends: mariadb-client-core (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} +Breaks: + mariadb-backup-10.1, + mariadb-backup-10.2, + mariadb-backup-10.3, + mariadb-client-10.1, +Replaces: + mariadb-backup-10.1, + mariadb-backup-10.2, + mariadb-backup-10.3, + mariadb-client-10.1, +Depends: + mariadb-client-core (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Description: Backup tool for MariaDB server Based on Xtrabackup, but improved to work with MariaDB server. This backup tool is guaranteed to be compatible with MariaDB server. @@ -575,22 +625,27 @@ Description: Backup tool for MariaDB server Package: mariadb-plugin-connect Architecture: any -Depends: libxml2, - mariadb-server (= ${server:Version}), - unixodbc, - ${misc:Depends}, - ${shlibs:Depends} -Recommends: curl -Conflicts: mariadb-connect-engine-10.0, - mariadb-connect-engine-10.1 -Breaks: mariadb-connect-engine-10.0, - mariadb-connect-engine-10.1, - mariadb-server-10.0, - mariadb-server-10.1 -Replaces: mariadb-connect-engine-10.0, - mariadb-connect-engine-10.1, - mariadb-server-10.0, - mariadb-server-10.1 +Depends: + libxml2, + mariadb-server (= ${server:Version}), + unixodbc, + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: + curl, +Conflicts: + mariadb-connect-engine-10.0, + mariadb-connect-engine-10.1, +Breaks: + mariadb-connect-engine-10.0, + mariadb-connect-engine-10.1, + mariadb-server-10.0, + mariadb-server-10.1, +Replaces: + mariadb-connect-engine-10.0, + mariadb-connect-engine-10.1, + mariadb-server-10.0, + mariadb-server-10.1, Description: Connect storage engine for MariaDB server Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), connections to ODBC tables and remote MySQL tables, as well as a number of @@ -599,9 +654,10 @@ Description: Connect storage engine for MariaDB server Package: mariadb-plugin-s3 Architecture: any -Depends: mariadb-server (= ${server:Version}), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server (= ${server:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Description: Amazon S3 archival storage engine for MariaDB The S3 storage engine allows one to archive MariaDB tables in Amazon S3 (or any third-party public or private cloud that implements S3 API), but still have @@ -609,16 +665,20 @@ Description: Amazon S3 archival storage engine for MariaDB Package: mariadb-plugin-rocksdb Architecture: amd64 arm64 mips64el ppc64el riscv64 -Depends: mariadb-server (= ${server:Version}), - python3:any, - rocksdb-tools, - ${misc:Depends}, - ${shlibs:Depends} -Breaks: mariadb-rocksdb-engine-10.2, - mariadb-rocksdb-engine-10.3 -Replaces: mariadb-rocksdb-engine-10.2, - mariadb-rocksdb-engine-10.3 -Recommends: python3-mysqldb +Depends: + mariadb-server (= ${server:Version}), + python3:any, + rocksdb-tools, + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + mariadb-rocksdb-engine-10.2, + mariadb-rocksdb-engine-10.3, +Replaces: + mariadb-rocksdb-engine-10.2, + mariadb-rocksdb-engine-10.3, +Recommends: + python3-mysqldb, Description: RocksDB storage engine for MariaDB server The RocksDB storage engine is a high performance storage engine, aimed at maximising storage efficiency while maintaining InnoDB-like performance. @@ -626,20 +686,24 @@ Description: RocksDB storage engine for MariaDB server Package: mariadb-plugin-oqgraph Architecture: any -Depends: libjudydebian1, - mariadb-server (= ${server:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: mariadb-oqgraph-engine-10.0, - mariadb-oqgraph-engine-10.1 -Breaks: mariadb-oqgraph-engine-10.0, - mariadb-oqgraph-engine-10.1, - mariadb-server-10.0, - mariadb-server-10.1 -Replaces: mariadb-oqgraph-engine-10.0, - mariadb-oqgraph-engine-10.1, - mariadb-server-10.0, - mariadb-server-10.1 +Depends: + libjudydebian1, + mariadb-server (= ${server:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + mariadb-oqgraph-engine-10.0, + mariadb-oqgraph-engine-10.1, +Breaks: + mariadb-oqgraph-engine-10.0, + mariadb-oqgraph-engine-10.1, + mariadb-server-10.0, + mariadb-server-10.1, +Replaces: + mariadb-oqgraph-engine-10.0, + mariadb-oqgraph-engine-10.1, + mariadb-server-10.0, + mariadb-server-10.1, Description: OQGraph storage engine for MariaDB server The OQGraph engine is a computation engine plugin for handling hierarchies (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL. @@ -647,13 +711,16 @@ Description: OQGraph storage engine for MariaDB server Package: mariadb-plugin-mroonga Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 -Depends: mariadb-server (= ${server:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Breaks: mariadb-server-10.0, - mariadb-server-10.1 -Replaces: mariadb-server-10.0, - mariadb-server-10.1 +Depends: + mariadb-server (= ${server:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + mariadb-server-10.0, + mariadb-server-10.1, +Replaces: + mariadb-server-10.0, + mariadb-server-10.1, Description: Mroonga storage engine for MariaDB server Mroonga (formerly named Groonga Storage Engine) is a storage engine that provides fast CJK-ready full text searching using column store. @@ -661,13 +728,16 @@ Description: Mroonga storage engine for MariaDB server Package: mariadb-plugin-spider Architecture: any -Depends: mariadb-server (= ${server:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Breaks: mariadb-server-10.0, - mariadb-server-10.1 -Replaces: mariadb-server-10.0, - mariadb-server-10.1 +Depends: + mariadb-server (= ${server:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + mariadb-server-10.0, + mariadb-server-10.1, +Replaces: + mariadb-server-10.0, + mariadb-server-10.1, Description: Spider storage engine for MariaDB server The Spider storage engine with built-in sharding features. It supports partitioning and xa transactions, and allows tables of different MariaDB server @@ -676,14 +746,17 @@ Description: Spider storage engine for MariaDB server Package: mariadb-plugin-gssapi-server Architecture: any -Depends: libgssapi-krb5-2, - mariadb-server, - ${misc:Depends}, - ${shlibs:Depends} -Breaks: mariadb-gssapi-server-10.1, - mariadb-gssapi-server-10.2 -Replaces: mariadb-gssapi-server-10.1, - mariadb-gssapi-server-10.2 +Depends: + libgssapi-krb5-2, + mariadb-server, + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + mariadb-gssapi-server-10.1, + mariadb-gssapi-server-10.2, +Replaces: + mariadb-gssapi-server-10.1, + mariadb-gssapi-server-10.2, Description: GSSAPI authentication plugin for MariaDB server This plugin includes support for Kerberos on Unix, but can also be used for Windows authentication with or without domain environment. @@ -692,14 +765,17 @@ Description: GSSAPI authentication plugin for MariaDB server Package: mariadb-plugin-gssapi-client Architecture: any -Depends: libgssapi-krb5-2, - mariadb-client (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Breaks: mariadb-gssapi-client-10.1, - mariadb-gssapi-client-10.2 -Replaces: mariadb-gssapi-client-10.1, - mariadb-gssapi-client-10.2 +Depends: + libgssapi-krb5-2, + mariadb-client (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + mariadb-gssapi-client-10.1, + mariadb-gssapi-client-10.2, +Replaces: + mariadb-gssapi-client-10.1, + mariadb-gssapi-client-10.2, Description: GSSAPI authentication plugin for MariaDB client This plugin includes support for Kerberos on Unix, but can also be used for Windows authentication with or without domain environment. @@ -708,10 +784,11 @@ Description: GSSAPI authentication plugin for MariaDB client Package: mariadb-plugin-cracklib-password-check Architecture: any -Depends: libcrack2 (>= 2.9.0), - mariadb-server (= ${server:Version}), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + libcrack2 (>= 2.9.0), + mariadb-server (= ${server:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Description: CrackLib Password Validation Plugin for MariaDB server This password validation plugin uses cracklib to allow only sufficiently secure (as defined by cracklib) user passwords in MariaDB server. @@ -721,18 +798,20 @@ Description: CrackLib Password Validation Plugin for MariaDB server Package: mariadb-plugin-hashicorp-key-management Architecture: any -Depends: mariadb-server, - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server, + ${misc:Depends}, + ${shlibs:Depends}, Description: Hashicorp Key Management plugin for MariaDB This encryption plugin uses Hashicorp Vault for storing encryption keys for MariaDB Data-at-Rest encryption. Package: mariadb-plugin-provider-bzip2 Architecture: any -Depends: mariadb-server (>= 1:10.11.1-1), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server (>= 1:10.11.1-1), + ${misc:Depends}, + ${shlibs:Depends}, Description: BZip2 compression support in the server and storage engines The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga, can use different compression libraries. @@ -744,9 +823,10 @@ Description: BZip2 compression support in the server and storage engines Package: mariadb-plugin-provider-lz4 Architecture: any -Depends: mariadb-server (>= 1:10.11.1-1), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server (>= 1:10.11.1-1), + ${misc:Depends}, + ${shlibs:Depends}, Description: LZ4 compression support in the server and storage engines The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga, can use different compression libraries. @@ -758,9 +838,10 @@ Description: LZ4 compression support in the server and storage engines Package: mariadb-plugin-provider-lzma Architecture: any -Depends: mariadb-server (>= 1:10.11.1-1), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server (>= 1:10.11.1-1), + ${misc:Depends}, + ${shlibs:Depends}, Description: LZMA compression support in the server and storage engines The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga, can use different compression libraries. @@ -772,9 +853,10 @@ Description: LZMA compression support in the server and storage engines Package: mariadb-plugin-provider-lzo Architecture: any -Depends: mariadb-server (>= 1:10.11.1-1), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server (>= 1:10.11.1-1), + ${misc:Depends}, + ${shlibs:Depends}, Description: LZO compression support in the server and storage engines The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga, can use different compression libraries. @@ -786,9 +868,10 @@ Description: LZO compression support in the server and storage engines Package: mariadb-plugin-provider-snappy Architecture: any -Depends: mariadb-server (>= 1:10.11.1-1), - ${misc:Depends}, - ${shlibs:Depends} +Depends: + mariadb-server (>= 1:10.11.1-1), + ${misc:Depends}, + ${shlibs:Depends}, Description: Snappy compression support in the server and storage engines The various MariaDB storage engines, such as InnoDB, RocksDB, Mroonga, can use different compression libraries. @@ -800,45 +883,50 @@ Description: Snappy compression support in the server and storage engines Package: mariadb-test Architecture: any -Depends: mariadb-client (= ${binary:Version}), - mariadb-server (= ${server:Version}), - mariadb-test-data (= ${source:Version}), - virtual-mysql-testsuite, - ${misc:Depends}, - ${shlibs:Depends} -Breaks: mariadb-test-10.0, - mariadb-test-10.1, - mariadb-test-5.5, - mysql-client-5.5, - mysql-server-5.5, - mysql-server-5.7, - mysql-server-core-8.0, - mysql-testsuite, - mysql-testsuite-5.5, - mysql-testsuite-5.6, - mysql-testsuite-5.7, - mysql-testsuite-8.0, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7 -Replaces: mariadb-test-10.0, - mariadb-test-10.1, - mariadb-test-5.5, - mysql-client-5.5, - mysql-server-5.5, - mysql-server-5.7, - mysql-server-core-8.0, - mysql-testsuite, - mysql-testsuite-5.5, - mysql-testsuite-5.6, - mysql-testsuite-5.7, - mysql-testsuite-8.0, - percona-server-server-5.6, - percona-xtradb-cluster-server-5.6, - percona-xtradb-cluster-server-5.7, - virtual-mysql-testsuite -Provides: virtual-mysql-testsuite -Suggests: patch +Depends: + mariadb-client (= ${binary:Version}), + mariadb-server (= ${server:Version}), + mariadb-test-data (= ${source:Version}), + virtual-mysql-testsuite, + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mysql-client-5.5, + mysql-server-5.5, + mysql-server-5.7, + mysql-server-core-8.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + mysql-testsuite-8.0, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, +Replaces: + mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mysql-client-5.5, + mysql-server-5.5, + mysql-server-5.7, + mysql-server-core-8.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + mysql-testsuite-8.0, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7, + virtual-mysql-testsuite, +Provides: + virtual-mysql-testsuite, +Suggests: + patch, Description: MariaDB database regression test suite MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -850,27 +938,30 @@ Description: MariaDB database regression test suite Package: mariadb-test-data Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, - ${perl:Depends}, - ${shlibs:Depends} -Breaks: mariadb-test-10.0, - mariadb-test-10.1, - mariadb-test-5.5, - mariadb-test-data-10.0, - mysql-testsuite, - mysql-testsuite-5.5, - mysql-testsuite-5.6, - mysql-testsuite-5.7, - mysql-testsuite-8.0 -Replaces: mariadb-test-10.0, - mariadb-test-10.1, - mariadb-test-5.5, - mariadb-test-data-10.0, - mysql-testsuite, - mysql-testsuite-5.5, - mysql-testsuite-5.6, - mysql-testsuite-5.7, - mysql-testsuite-8.0 +Depends: + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends}, +Breaks: + mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mariadb-test-data-10.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + mysql-testsuite-8.0, +Replaces: + mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mariadb-test-data-10.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + mysql-testsuite-8.0, Description: MariaDB database regression test suite - data files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query diff --git a/debian/gbp.conf b/debian/gbp.conf index c82f8327..fd0fdf63 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,14 +3,19 @@ # for contributors to work with feature and bugfix branches ignore-branch = True +# Always use pristine tar +pristine-tar = True + # Always sign everything sign-tags = True upstream-signatures = on # DEP-14 format debian-branch = debian/latest -upstream-branch = 10.11 -upstream-tag = mariadb-%(version)s +upstream-branch = upstream/latest + +# Upstream tag format +upstream-vcs-tag = mariadb-%(version)s # MariaDB has submodules submodules = True diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index b6af1d5b..8bf8245e 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -19,7 +19,6 @@ usr/include/mariadb/mysql.h usr/include/mariadb/mysql/ usr/include/mariadb/mysql/client_plugin.h usr/include/mariadb/mysql/plugin_auth.h -usr/include/mariadb/mysql/plugin_auth_common.h usr/include/mariadb/mysql_com.h usr/include/mariadb/mysql_version.h usr/include/mariadb/mysqld_error.h diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst index ca267a3a..82732921 100644 --- a/debian/mariadb-server.postinst +++ b/debian/mariadb-server.postinst @@ -127,7 +127,7 @@ EOF ! lsof -nt "$mysql_datadir"/mysql/user.MYD > /dev/null && [ ! -f "$mysql_datadir/undo_001" ] then - echo "UPDATE mysql.user SET plugin='unix_socket' WHERE plugin='auth_socket';" | \ + echo "UPDATE mysql.user SET plugin='unix_socket' WHERE plugin='auth_socket';" | mariadbd --skip-innodb --key_buffer_size=0 --default-storage-engine=MyISAM --bootstrap 2> /dev/null fi @@ -194,7 +194,7 @@ EOF TMPDIR='' bash /usr/bin/mariadb-install-db \ --rpm --cross-bootstrap \ --user=mysql --disable-log-bin \ - --skip-test-db 2>&1 | \ + --skip-test-db 2>&1 | $ERR_LOGGER set -e @@ -302,4 +302,3 @@ esac db_stop # in case invoke fails #DEBHELPER# - diff --git a/debian/mariadb-server.postrm b/debian/mariadb-server.postrm index 64e194f2..fc8401bc 100644 --- a/debian/mariadb-server.postrm +++ b/debian/mariadb-server.postrm @@ -12,8 +12,6 @@ fi ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } -#DEBHELPER# - # # - Purge logs and data only if they are ours (#307473) # - Remove the mysql user only after all his owned files are purged. @@ -55,3 +53,5 @@ then fi fi + +#DEBHELPER# diff --git a/debian/patches/1063738-revert-c432c9ef.patch b/debian/patches/1063738-revert-c432c9ef.patch deleted file mode 100644 index e5e2668e..00000000 --- a/debian/patches/1063738-revert-c432c9ef.patch +++ /dev/null @@ -1,25 +0,0 @@ -Forwarded: no -From: Otto Kekäläinen <otto@debian.org> -Date: Wed, 21 Feb 2024 20:34:12 -0800 -Subject: [PATCH] Revert compile_time_assert() changes from "MDEV-32862 MYSQL struct in C/C and server differs" - -This partially reverts commit c432c9ef19bf6ff40ab9551bcae202d7e1319878 which -most likely caused the regression that broke builds on many 32-bit platforms. - ---- a/tests/mysql_client_fw.c -+++ b/tests/mysql_client_fw.c -@@ -1430,14 +1430,6 @@ int main(int argc, char **argv) - tests_to_run[i]= NULL; - } - --#ifdef _WIN32 -- /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */ -- compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728); --#else -- /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */ -- compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); --#endif -- - if (mysql_server_init(embedded_server_arg_count, - embedded_server_args, - (char**) embedded_server_groups)) diff --git a/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch b/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch deleted file mode 100644 index 7607cfd7..00000000 --- a/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ -Forwarded: https://github.com/MariaDB/server/pull/2129 (merged in Feb 2024) -Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2129.patch -From: Otto Kekäläinen <otto@kekalainen.net> -Date: Sun, 22 May 2022 10:13:33 -0700 -Subject: [PATCH] Properly introduce wsrep_sst_backup script in project - packaging - -The script wsrep_sst_backup was introduced on MariaDB 10.3 in commit -9b2fa2a. The new script was automatically included in RPM packages but not -in Debian packages (which started to fail on warning about stray file). - -Include wsrep_sst_backup in the mariadb-server-10.{3..8} package, and -also include a stub man page so that packaging of a new script is complete. - ---- - debian/mariadb-server-10.6.install | 2 ++ - man/CMakeLists.txt | 2 +- - man/wsrep_sst_backup.1 | 16 ++++++++++++++++ - 3 files changed, 19 insertions(+), 1 deletion(-) - create mode 100644 man/wsrep_sst_backup.1 - ---- a/man/CMakeLists.txt -+++ b/man/CMakeLists.txt -@@ -13,7 +13,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA - --SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1 -+SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1 wsrep_sst_backup.1 - wsrep_sst_mysqldump.1 wsrep_sst_rsync_wan.1 galera_recovery.1 galera_new_cluster.1) - SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1 - aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1 ---- /dev/null -+++ b/man/wsrep_sst_backup.1 -@@ -0,0 +1,16 @@ -+'\" t -+.\" -+.TH "\FBWSREP_SST_BACKUP\FR" "1" "22 May 2022" "MariaDB 10\&.3" "MariaDB Database System" -+.\" ----------------------------------------------------------------- -+.\" * set default formatting -+.\" ----------------------------------------------------------------- -+.\" disable hyphenation -+.nh -+.\" disable justification (adjust text to left margin only) -+.ad l -+.SH NAME -+wsrep_sst_backup \- backup helper script for the MariaDB Galera Cluster -+.SH DESCRIPTION -+Use: See source code of script\. -+.PP -+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch index bbc1af6b..b6dd97e3 100644 --- a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch +++ b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch @@ -1,6 +1,4 @@ -Forwarded: https://github.com/MariaDB/server/pull/2541 -Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2541.patch -Bug: https://jira.mariadb.org/browse/MDEV-31151 +From fd83a9431cd16e6c61b8cdbb89810c554a315338 Mon Sep 17 00:00:00 2001 From: Hugo Wen <wenhug@amazon.com> Date: Sat, 11 Mar 2023 00:27:42 +0000 Subject: [PATCH] Fix a stack overflow in pinbox allocator @@ -126,7 +124,7 @@ Services, Inc. { for (i= 0; i < LF_PINBOX_PINS; i++) { - void *p= el->pin[i]; + void *p= my_atomic_loadptr((void **)&el->pin[i]); if (p) - *hv->granary++= p; + { @@ -172,7 +170,7 @@ Services, Inc. - LF_PINS *el_end= el+LF_DYNARRAY_LEVEL_LENGTH; - for (; el < el_end; el++) - for (i= 0; i < LF_PINBOX_PINS; i++) -- if (el->pin[i] == addr) +- if (my_atomic_loadptr((void **)&el->pin[i]) == addr) - return 1; - return 0; -} diff --git a/debian/patches/2980-riscv-use-rdtime.patch b/debian/patches/2980-riscv-use-rdtime.patch deleted file mode 100644 index a2e21ddb..00000000 --- a/debian/patches/2980-riscv-use-rdtime.patch +++ /dev/null @@ -1,59 +0,0 @@ -Forwarded: https://github.com/MariaDB/server/pull/2980 (merged in Feb 2024) -Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2980.patch -From: Aurelien Jarno <aurelien@aurel32.net> -Date: Thu, 4 Jan 2024 11:30:34 +0100 -Subject: [PATCH] RISC-V: use RDTIME instead of RDCYCLE - -Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on -RISC-V and can't be used directly from userland. There is a sysctl -option to change that as a transition period, but it will eventually -disappear. - -Use RDTIME instead, which while less accurate has the advantage of being -synchronized between CPU (and thus monotonic) and of constant frequency. - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 ---- - include/my_rdtsc.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- a/include/my_rdtsc.h -+++ b/include/my_rdtsc.h -@@ -111,7 +111,7 @@ C_MODE_START - On AARCH64, we use the generic timer base register. We override clang - implementation for aarch64 as it access a PMU register which is not - guaranteed to be active. -- On RISC-V, we use the rdcycle instruction to read from mcycle register. -+ On RISC-V, we use the rdtime instruction to read from mtime register. - - Sadly, we have nothing for the Digital Alpha, MIPS, Motorola m68k, - HP PA-RISC or other non-mainstream (or obsolete) processors. -@@ -211,15 +211,15 @@ static inline ulonglong my_timer_cycles( - } - #elif defined(__riscv) - #define MY_TIMER_ROUTINE_CYCLES MY_TIMER_ROUTINE_RISCV -- /* Use RDCYCLE (and RDCYCLEH on riscv32) */ -+ /* Use RDTIME (and RDTIMEH on riscv32) */ - { - # if __riscv_xlen == 32 - ulong result_lo, result_hi0, result_hi1; - /* Implemented in assembly because Clang insisted on branching. */ - __asm __volatile__( -- "rdcycleh %0\n" -- "rdcycle %1\n" -- "rdcycleh %2\n" -+ "rdtimeh %0\n" -+ "rdtime %1\n" -+ "rdtimeh %2\n" - "sub %0, %0, %2\n" - "seqz %0, %0\n" - "sub %0, zero, %0\n" -@@ -228,7 +228,7 @@ static inline ulonglong my_timer_cycles( - return (static_cast<ulonglong>(result_hi1) << 32) | result_lo; - # else - ulonglong result; -- __asm __volatile__("rdcycle %0" : "=r"(result)); -+ __asm __volatile__("rdtime %0" : "=r"(result)); - return result; - } - # endif diff --git a/debian/patches/3039-os-data-file-no-o-direct.patch b/debian/patches/3039-os-data-file-no-o-direct.patch deleted file mode 100644 index 634bfbd9..00000000 --- a/debian/patches/3039-os-data-file-no-o-direct.patch +++ /dev/null @@ -1,32 +0,0 @@ -Forwarded: https://github.com/MariaDB/server/pull/3039 (merged in Feb 2024) -Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3039.patch -From: Daniel Black <daniel@mariadb.org> -Date: Fri, 2 Feb 2024 11:38:00 +1100 -Subject: [PATCH] MDEV-33095 MariaDB-backup - no OS_DATA_FILE_NO_O_DIRECT on - some platforms - -Postfix for a6290a5bc5f3cba096854595c354d19d9267743d, in 10.11 -where OS_DATA_FILE_NO_O_DIRECT gets used. Same #ifdef conditions -as other uses of OS_DATA_FILE_NO_O_DIRECT. - -Noticed on aarch64-macos builder. ---- - extra/mariabackup/xtrabackup.cc | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/extra/mariabackup/xtrabackup.cc -+++ b/extra/mariabackup/xtrabackup.cc -@@ -2428,7 +2428,12 @@ static bool innodb_init() - os_file_delete_if_exists_func(ib_logfile0.c_str(), nullptr); - os_file_t file= os_file_create_func(ib_logfile0.c_str(), - OS_FILE_CREATE, OS_FILE_NORMAL, -- OS_DATA_FILE_NO_O_DIRECT, false, &ret); -+#if defined _WIN32 || defined HAVE_FCNTL_DIRECT -+ OS_DATA_FILE_NO_O_DIRECT, -+#else -+ OS_DATA_FILE, -+#endif -+ false, &ret); - if (!ret) - { - invalid_log: diff --git a/debian/patches/3154-openssl-alert-protocol-string.patch b/debian/patches/3154-openssl-alert-protocol-string.patch deleted file mode 100644 index a2aa8767..00000000 --- a/debian/patches/3154-openssl-alert-protocol-string.patch +++ /dev/null @@ -1,39 +0,0 @@ -Forwarded: https://github.com/MariaDB/server/pull/3154 -Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3154.patch -From: Zhibo Zhang <zhibo@amazon.com> -Date: Tue, 19 Mar 2024 19:16:46 +0000 -Subject: [PATCH] Update tests to be compatible with OpenSSL 3.2.0 - -As of version 3.2.0, OpenSSL updated the error message in new versions -("https://github.com/openssl/openssl/commit/81b741f68984"). Update the -tests and result files such that they are compatible with both original -and new error messages. - -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. ---- - mysql-test/main/ssl_crl.result | 2 +- - mysql-test/main/ssl_crl.test | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/mysql-test/main/ssl_crl.result -+++ b/mysql-test/main/ssl_crl.result -@@ -2,4 +2,4 @@ - Variable_name Value - Ssl_version TLS_VERSION - # try logging in with a certificate in the server's --ssl-crl : should fail --ERROR 2026 (HY000): TLS/SSL error: sslv3 alert certificate revoked -+ERROR 2026 (HY000): TLS/SSL error: ssl/tls alert certificate revoked ---- a/mysql-test/main/ssl_crl.test -+++ b/mysql-test/main/ssl_crl.test -@@ -7,7 +7,7 @@ - --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/server-new-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/server-new-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" - - --echo # try logging in with a certificate in the server's --ssl-crl : should fail --# OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different ----replace_regex /ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+/ERROR 2026 (HY000): TLS\/SSL error: sslv3 alert certificate revoked/ -+# OpenSSL 1.1.1a and later releases correctly rejects the certificate, but the error message is different -+--replace_regex /(ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+|ERROR 2026 \(HY000\): TLS\/SSL error: sslv3 alert certificate revoked)/ERROR 2026 (HY000): TLS\/SSL error: ssl\/tls alert certificate revoked/ - --error 1 - --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1 diff --git a/debian/patches/MDEV-32975-chartset-collation-fix-php.patch b/debian/patches/MDEV-32975-chartset-collation-fix-php.patch deleted file mode 100644 index e1282019..00000000 --- a/debian/patches/MDEV-32975-chartset-collation-fix-php.patch +++ /dev/null @@ -1,45 +0,0 @@ -Origin: https://github.com/MariaDB/server/commit/1b37cb71f44549c94acf8914cf93d43a4293a449 (merged in Feb 2024) -Bug: https://jira.mariadb.org/browse/MDEV-32975 -From: Alexander Barkov <bar@mariadb.com> -Date: Fri, 26 Jan 2024 13:12:03 +0400 -Subject: [PATCH] MDEV-32975 Default charset doesn't work with PHP MySQLi - extension - -When sending the server default collation ID to the client -in the handshake packet, translate a 2-byte collation ID -to the ID of the default collation for the character set. ---- - sql/sql_acl.cc | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - ---- a/sql/sql_acl.cc -+++ b/sql/sql_acl.cc -@@ -13354,8 +13354,27 @@ static bool send_server_handshake_packet - *end++= 0; - - int2store(end, thd->client_capabilities); -+ -+ CHARSET_INFO *handshake_cs= default_charset_info; -+ if (handshake_cs->number > 0xFF) -+ { -+ /* -+ A workaround for a 2-byte collation ID: translate it into -+ the ID of the primary collation of this character set. -+ */ -+ CHARSET_INFO *cs= get_charset_by_csname(handshake_cs->cs_name.str, -+ MY_CS_PRIMARY, MYF(MY_WME)); -+ /* -+ cs should not normally be NULL, however it may be possible -+ with a dynamic character set incorrectly defined in Index.xml. -+ For safety let's fallback to latin1 in case cs is NULL. -+ */ -+ handshake_cs= cs ? cs : &my_charset_latin1; -+ } -+ - /* write server characteristics: up to 16 bytes allowed */ -- end[2]= (char) default_charset_info->number; -+ end[2]= (char) handshake_cs->number; -+ - int2store(end+3, mpvio->auth_info.thd->server_status); - int2store(end+5, thd->client_capabilities >> 16); - end[7]= data_len; diff --git a/debian/patches/fix-spelling-mariadb.patch b/debian/patches/fix-spelling-mariadb.patch index 0eb88d3f..5d5265cb 100644 --- a/debian/patches/fix-spelling-mariadb.patch +++ b/debian/patches/fix-spelling-mariadb.patch @@ -14,3 +14,77 @@ Subject: [PATCH] Fix misc spelling in MariaDB Server repository cap = NULL; } catch (const char *msg) { htrc(g->Message, msg); +--- a/extra/mariabackup/innobackupex.cc ++++ b/extra/mariabackup/innobackupex.cc +@@ -188,7 +188,7 @@ enum innobackupex_options + OPT_DATABASES, + OPT_DECOMPRESS, + +- /* options wich are passed directly to xtrabackup */ ++ /* options which are passed directly to xtrabackup */ + OPT_CLOSE_FILES, + OPT_COMPACT, + OPT_COMPRESS, +@@ -447,7 +447,7 @@ static struct my_option ibx_long_options + {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT, + "This option specifies time in seconds that mariadb-backup should wait for " + "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all " +- "currently running queries using explicite LOCK TABLES has ended. " ++ "currently running queries using explicit LOCK TABLES has ended. " + "If there are still such queries when the timeout expires, mariadb-backup " + "terminates with an error. Default is 0, in which case mariadb-backup waits " + "indefinitely for BACKUP STAGE START to finish", +--- a/extra/mariabackup/xtrabackup.cc ++++ b/extra/mariabackup/xtrabackup.cc +@@ -217,7 +217,7 @@ uint xtrabackup_compress = FALSE; + uint xtrabackup_compress_threads; + ulonglong xtrabackup_compress_chunk_size = 0; + +-/* sleep interval beetween log copy iterations in log copying thread ++/* sleep interval between log copy iterations in log copying thread + in milliseconds (default is 1 second) */ + ulint xtrabackup_log_copy_interval = 1000; + static ulong max_buf_pool_modified_pct; +@@ -1597,11 +1597,11 @@ struct my_option xb_client_options[]= { + GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + + {"rsync", OPT_RSYNC, +- "Obsolete depricated option", ++ "Obsolete deprecated option", + &ignored_option, &ignored_option, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + + {"no-backup-locks", OPT_NO_BACKUP_LOCKS, +- "Obsolete depricated option", ++ "Obsolete deprecated option", + &ignored_option, &ignored_option, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + + {"force-non-empty-directories", OPT_FORCE_NON_EMPTY_DIRS, +@@ -1729,7 +1729,7 @@ struct my_option xb_client_options[]= { + {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT, + "This option specifies time in seconds that mariadb-backup should wait for " + "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all " +- "currently running queries using explicite LOCK TABLES has ended. " ++ "currently running queries using explicit LOCK TABLES has ended. " + "If there are still such queries when the timeout expires, mariadb-backup " + "terminates with an error. Default is 0, in which case mariadb-backup waits " + "indefinitely for BACKUP STAGE START to finish", +@@ -5622,7 +5622,7 @@ void CorruptedPages::backup_fix_ddl(ds_c + } + + /* Mariabackup doesn't detect any FILE_OP for the deferred +- tablespace. There is a possiblity that page0 could've ++ tablespace. There is a possibility that page0 could've + been corrupted persistently in the disk */ + for (auto space_name: defer_space_names) { + if (!check_if_skip_table(space_name.c_str())) { +--- a/support-files/mysql.server.sh ++++ b/support-files/mysql.server.sh +@@ -194,7 +194,7 @@ su_kill() { + + # + # Read defaults file from 'basedir'. If there is no defaults file there +-# check if it's in the old (depricated) place (datadir) and read it from there ++# check if it's in the old (deprecated) place (datadir) and read it from there + # + + extra_args="" diff --git a/debian/patches/hurd-i386-plugin_disks_information_schema_disks.cc.patch b/debian/patches/hurd-i386-plugin_disks_information_schema_disks.cc.patch new file mode 100644 index 00000000..ca5b669a --- /dev/null +++ b/debian/patches/hurd-i386-plugin_disks_information_schema_disks.cc.patch @@ -0,0 +1,19 @@ +Forwarded: no +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094 +Author: Svante Signell <svante.signell@gmail.com> +Subject: Bug#1069094: mariadb: FTBFS on hurd-i386 + +Define PATH_MAX if not defined. + +--- a/plugin/disks/information_schema_disks.cc ++++ b/plugin/disks/information_schema_disks.cc +@@ -32,6 +32,9 @@ + #include <sys/mntent.h> + #endif + #endif ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif + #include <sql_class.h> + #include <sql_i_s.h> + #include <sql_acl.h> /* check_global_access() */ diff --git a/debian/patches/hurd-i386-storage_connect_ioapi.h.patch b/debian/patches/hurd-i386-storage_connect_ioapi.h.patch new file mode 100644 index 00000000..75cd7dfa --- /dev/null +++ b/debian/patches/hurd-i386-storage_connect_ioapi.h.patch @@ -0,0 +1,22 @@ +Forwarded: no +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094 +Author: Svante Signell <svante.signell@gmail.com> +Subject: Bug#1069094: mariadb: FTBFS on hurd-i386 + +Add Hurd to define __USE_FILE_OFFSET64 et al. + +--- a/storage/connect/ioapi.h ++++ b/storage/connect/ioapi.h +@@ -21,9 +21,10 @@ + #ifndef _ZLIBIOAPI64_H + #define _ZLIBIOAPI64_H + +-#if defined(__linux__) ++#if defined(__linux__) || defined (__GNU__) + +- // Linux needs this to support file operation on files larger then 4+GB ++ // Linux and Hurd needs this to support file operation on files larger ++ // than 4+GB. + // But might need better if/def to select just the platforms that needs them. + + #ifndef __USE_FILE_OFFSET64 diff --git a/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch b/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch index 1034f8c6..eeb91cc7 100644 --- a/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch +++ b/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch @@ -9,7 +9,7 @@ Subject: [PATCH] cmake: add support for reproducible buildS We can use target without breaking reproducibility. --- a/storage/mroonga/CMakeLists.txt +++ b/storage/mroonga/CMakeLists.txt -@@ -209,7 +209,7 @@ set(MYSQL_INCLUDE_DIRS +@@ -214,7 +214,7 @@ set(MYSQL_INCLUDE_DIRS if(MRN_BUNDLED) set(MYSQL_PLUGIN_DIR "${INSTALL_PLUGINDIR}") @@ -18,7 +18,7 @@ Subject: [PATCH] cmake: add support for reproducible buildS set(MYSQL_CFLAGS "${CMAKE_C_FLAGS}") set(MYSQL_VERSION "${MYSQL_BASE_VERSION}") else() -@@ -248,15 +248,11 @@ endif() +@@ -253,15 +253,11 @@ endif() if(MRN_GROONGA_BUNDLED) set(GROONGA_INCLUDE_DIRS "${MRN_BUNDLED_GROONGA_DIR}/include") diff --git a/debian/patches/series b/debian/patches/series index 69ef5c47..d1a6925a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,15 +4,11 @@ env-perl-usr-bin-perl.patch fix-spelling-rocksdb.patch fix-reproducible-builds-rocksdb.patch mroonga-mrn-lib-dirs-path-reproducible-build.patch -2129-new-script-wsrep-sst-backup-fixes.patch 2541-fix-stack-overflow-in-pinbox-allocator.patch fix-spelling-libmariadb.patch -2980-riscv-use-rdtime.patch install-files-into-usr.patch 1006531-hurd-no-auth-socket.patch -3039-os-data-file-no-o-direct.patch -1063738-revert-c432c9ef.patch -MDEV-32975-chartset-collation-fix-php.patch startup-message.patch fix-spelling-mariadb.patch -3154-openssl-alert-protocol-string.patch +hurd-i386-plugin_disks_information_schema_disks.cc.patch +hurd-i386-storage_connect_ioapi.h.patch diff --git a/debian/patches/startup-message.patch b/debian/patches/startup-message.patch index 27b86b3d..6b8bbce7 100644 --- a/debian/patches/startup-message.patch +++ b/debian/patches/startup-message.patch @@ -27,7 +27,7 @@ Server output if build in git directory: --- a/client/mysql.cc +++ b/client/mysql.cc -@@ -1326,6 +1326,9 @@ int main(int argc,char *argv[]) +@@ -1328,6 +1328,9 @@ int main(int argc,char *argv[]) mysql_thread_id(&mysql), server_version_string(&mysql)); put_info((char*) glob_buffer.ptr(),INFO_INFO); put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO); @@ -39,16 +39,16 @@ Server output if build in git directory: #ifdef HAVE_READLINE --- a/sql/mysqld.cc +++ b/sql/mysqld.cc -@@ -4983,12 +4983,21 @@ static int init_server_components() - proc_info_hook= set_thd_stage_info; +@@ -4985,12 +4985,21 @@ static int init_server_components() + my_sleep_for_space= mariadb_sleep_for_space; /* -- Print source revision hash, as one of the first lines, if not the -- first in error log, for troubleshooting and debugging purposes -+ Print source revision hash, if set, for troubleshooting and debugging -+ purposes. If not, suggest database adming to help project by giving a -+ star on GitHub. -  */ +- Print source revision hash, as one of the first lines, if not the +- first in error log, for troubleshooting and debugging purposes ++ Print source revision hash, if set, for troubleshooting and debugging ++ purposes. If not, suggest database adming to help project by giving a ++ star on GitHub. + */ - if (!opt_help) - sql_print_information("Starting MariaDB %s source revision %s as process %lu", - server_version, SOURCE_REVISION, (ulong) getpid()); diff --git a/debian/po/sw.po b/debian/po/sw.po new file mode 100644 index 00000000..ec5d48e3 --- /dev/null +++ b/debian/po/sw.po @@ -0,0 +1,110 @@ +# Translation of mariadb debconf templates to Swahili +# Copyright (C) 2023, MariaDB authors. +# This file is distributed under the same license as the mariadb packages. +# +# Translators: +# Nicholas Othieno <nothieno@amazon.com>, 2023. +msgid "" +msgstr "" +"Project-Id-Version: mariadb\n" +"Report-Msgid-Bugs-To: mariadb@packages.debian.org\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2023-06-16 18:32-0400\n" +"Last-Translator: Nicholas Othieno <nothieno@amazon.com>\n" +"Language-Team: Swahili <(nothing)>\n" +"Language: sw\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"debian.org>\n" +"X-Generator: Poedit 3.2.2\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" + +#. Type: note +#. Description +#: ../mariadb-server.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "Saraka la zamani la data itahifadhiwa kwenye eneo jipya" + +#. Type: note +#. Description +#: ../mariadb-server.templates:2001 +msgid "" +"A file named /var/lib/mysql/debian-*.flag exists on this system. The number " +"indicates a database binary format version that cannot automatically be " +"upgraded (or downgraded)." +msgstr "" +"Faili linaloitwa /var/lib/mysql/debian-*.flag lipo katika mfumo huu. Namba " +"inaonyesha toleo la umbizo wa mfumo wa jozi la hifadhidata ambalo haliwezi " +"kuboreshwa (au kushushwa) kiotomatiki." + +#. Type: note +#. Description +#: ../mariadb-server.templates:2001 +msgid "" +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." +msgstr "" +"Hivyo basi saraka la zamani la data litapewa jina jipya kuwa /var/lib/mysql-* " +"na saraka jipya la data litaanzishwa kwenye /var/lib/mysql." + +#. Type: note +#. Description +#: ../mariadb-server.templates:2001 +msgid "" +"Please manually export/import your data (e.g. with mysqldump) if needed." +msgstr "" +"Tafadhali peleka/ingiza data yako kwa mkono (kwa mfano kwa kutumia mysqldump) ikiwa inahitajika." + +#. Type: note +#. Description +#: ../mariadb-server.templates:3001 +msgid "Important note for NIS/YP users" +msgstr "Ujumbe muhimu kwa watumiaji wa NIS/YP" + +#. Type: note +#. Description +#: ../mariadb-server.templates:3001 +msgid "" +"Using MariaDB under NIS/YP requires a mysql user account to be added on the " +"local system with:" +msgstr "" +"Kutumia MariaDB chini ya NIS/YP inahitaji akaunti ya mtumiaji wa mysql kuongezwa " +"katika mfumo wa ndani na:" + +#. Type: note +#. Description +#: ../mariadb-server.templates:3001 +msgid "" +"You should also check the permissions and ownership of the /var/lib/mysql " +"directory:" +msgstr "" +"Unapaswa pia kukagua ruhusa na umiliki wa saraka la /var/lib/mysql:" + +#. Type: boolean +#. Description +#: ../mariadb-server.templates:4001 +msgid "Remove all MariaDB databases?" +msgstr "Ondoa hifadhidata zote za MariaDB?" + +#. Type: boolean +#. Description +#: ../mariadb-server.templates:4001 +msgid "" +"The /var/lib/mysql directory which contains the MariaDB databases is about " +"to be removed." +msgstr "" +"Eneo la /var/lib/mysql ambalo lina hifadhidata za MariaDB linakaribia " +"kuondolewa." + +#. Type: boolean +#. Description +#: ../mariadb-server.templates:4001 +msgid "" +"If you're removing the MariaDB package in order to later install a more " +"recent version or if a different mariadb-server package is already using it, " +"the data should be kept." +msgstr "" +"Ikiwa unatoa kifurushi cha MariaDB ili kusakinisha toleo jipya zaidi baadaye " +"au ikiwa kifurushi tofauti cha mariadb-server tayari inaitumia data, data " +"inapaswa kuwekwa."
\ No newline at end of file diff --git a/debian/rules b/debian/rules index 45c74f74..94eb814f 100755 --- a/debian/rules +++ b/debian/rules @@ -80,10 +80,10 @@ override_dh_auto_clean: rm -rf storage/columnstore # Delete precompiled binaries in upstream sources to ensure they are not used in Debian rm -rf storage/connect/JavaWrappers.jar storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2 - + # Update po-files when clean runs before each build debconf-updatepo - + # Clean up files created by custom sections in build that 'dh clean' does not see automatically rm -rf debian/mariadb-server.*.socket debian/substvars @@ -122,6 +122,7 @@ endif -DIGNORE_AIO_CHECK=ON \ -DWITH_URING=ON \ -DWITH_INNODB_SNAPPY=ON \ + -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \ -DDEB=$(DEB_VENDOR) # This is needed, otherwise 'make test' will run before binaries have been built @@ -204,8 +205,17 @@ override_dh_auto_install: # Move test plugins that are only needed by the client to the libmariadb path mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/ +# Define name used for service, and install mariadb.service on Linux only override_dh_installsystemd: +ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS))) dh_installsystemd -pmariadb-server mariadb.service +endif + +# Change dh_missing from fail to list on non-Linux +override_dh_missing: +ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS))) + dh_missing --list-missing +endif override_dh_installinit-arch: dh_installinit --name=mariadb diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index ca2c14b1..f699166c 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -60,7 +60,12 @@ packaging-fix-checks: stage: provisioning image: debian:sid-slim script: - - apt-get update -qq && apt-get -qq install --no-install-recommends --yes git devscripts python3-debian shellcheck make lsb-release + - apt-get update -qq && apt-get -qq install --no-install-recommends --yes git devscripts python3-debian shellcheck make lsb-release dh-debputy python3-pygls + # Check debian/* for typical errors. Don't check spelling as there are too + # many false positives and anyway spelling issues are level 'pedantic' in + # Debputy and do not emit an exit code, so wouldn't show up as failure in CI + # anyway. + - debputy lint - | if [ "$(find debian/patches/ -type f -not -name series | wc -l)" -eq "$(cat debian/patches/series | wc -l)" ] then @@ -74,15 +79,15 @@ packaging-fix-checks: exit 1 fi - | - wrap-and-sort -a + wrap-and-sort -ast git checkout debian/tests/control # Revert touching this file, wrap-and-sort shouldn't do it if [ "$(git diff --name-only | wc -l)" -eq 0 ] then - echo "No uncommitted changes after 'wrap-and-sort -av', maintainer has done good job keeping files in order." + echo "No uncommitted changes after 'wrap-and-sort -ast', maintainer has done good job keeping files in order." else git diff echo - echo "Debian packaging files are unordered! Please run 'wrap-and-sort -av'." + echo "Debian packaging files are unordered! Please run 'wrap-and-sort -vast'." exit 1 fi # Print syntax errors if found, otherwise continue silently @@ -99,6 +104,21 @@ packaging-fix-checks: test-crossbuild-arm64: stage: build + # Cross-builds allowed to fail by default in Salsa-CI + +test-crossbuild-armhf: + stage: build + extends: .test-crossbuild-package-arm64 + variables: + HOST_ARCH: armhf + allow_failure: true # Cross-builds seem to fail frequently due to unclear reasons + +test-crossbuild-armel: + stage: build + extends: .test-crossbuild-package-arm64 + variables: + HOST_ARCH: armel + allow_failure: true # Cross-builds seem to fail frequently due to unclear reasons autopkgtest: extends: .test-autopkgtest @@ -142,6 +162,13 @@ blhc: curl -sS -O https://snapshot.debian.org/archive/debian/20220507T034236Z/pool/main/o/openssl/libssl1.1_1.1.1o-1_amd64.deb apt-get -qq install --no-install-recommends --yes ./libssl1.1_1.1.1o-1_amd64.deb +# Package libaio1 was replaced by libaio1t64 in Debian Sid in April 2024. To +# continue installing old MariaDB versions that depend on libaio1, use libaio1 +# from snapshots. +.test-install-libaio-in-sid-for-backwards-compat: &test-install-libaio-in-sid-for-backwards-compat | + curl -sS -O https://snapshot.debian.org/archive/debian/20240331T210805Z/pool/main/liba/libaio/libaio1_0.3.113-5_amd64.deb + apt-get -qq install --no-install-recommends --yes ./libaio1_0.3.113-5_amd64.deb + .test-verify-initial: &test-verify-initial | dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed # MariaDB until 10.5 only had 'mysql', and since only 'mariadb', so try both @@ -918,6 +945,7 @@ mariadb.org-10.4 upgrade: script: - *test-install-readline-in-sid-for-backwards-compat - *test-install-openssl1-in-sid-for-backwards-compat + - *test-install-libaio-in-sid-for-backwards-compat - apt-get install -qq --yes mariadb-server-10.4 # MariaDB.org version of 10.4 and early 10.5 do not install an init file, so # it must be installed here manually @@ -938,6 +966,7 @@ mariadb.org-10.3 upgrade: script: - *test-install-readline-in-sid-for-backwards-compat - *test-install-openssl1-in-sid-for-backwards-compat + - *test-install-libaio-in-sid-for-backwards-compat - apt-get install -qq --yes mariadb-server-10.3 - *test-verify-initial - *test-install-all @@ -958,6 +987,7 @@ mariadb.org-10.2 upgrade: script: - *test-install-readline-in-sid-for-backwards-compat - *test-install-openssl1-in-sid-for-backwards-compat + - *test-install-libaio-in-sid-for-backwards-compat - apt-get install -qq --yes mariadb-server-10.2 # Verify initial state before upgrade - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 72674895..edf48ebc 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -20,14 +20,12 @@ very-long-line-length-in-source-file * [*.cproject:*] very-long-line-length-in-source-file * [*.launch:*] very-long-line-length-in-source-file * [*.md:*] very-long-line-length-in-source-file * [*.scfg:*] -very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/configure.ac:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/ssl.h:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/types.h:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/wolfio.h:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/formats/html/html_changes/tabs.css:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/IDE/Espressif/ESP-IDF/test/test_wolfssl.c:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/IDE/IAR-MSP430/main.c:*] -very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/README:*] # Preprocessed C files which have long lines very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/wolfcrypt/src/*.i:*] # These are all results for test cases and similar so they can be diff --git a/debian/tests/control b/debian/tests/control index d91e3b11..2a8c23a5 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,20 +1,21 @@ Tests: configuration-tracing -Depends: mariadb-server, diffutils +Depends: + diffutils, + mariadb-server, Restrictions: allow-stderr needs-root Tests: smoke -# RocksDB is not built for all archs. Rather than duplicating the condition -# for its existence (see the list in debian/control), install it if available -# and check in the test if it's functional when it should be. -# The plugin package also already depends on the other one. -Depends: mariadb-plugin-rocksdb | mariadb-server, - mariadb-plugin-provider-bzip2, - mariadb-plugin-provider-lz4, - mariadb-plugin-provider-lzma, - mariadb-plugin-provider-lzo, - mariadb-plugin-provider-snappy +Depends: + mariadb-plugin-provider-bzip2, + mariadb-plugin-provider-lz4, + mariadb-plugin-provider-lzma, + mariadb-plugin-provider-lzo, + mariadb-plugin-provider-snappy, + mariadb-plugin-rocksdb [amd64 arm64 mips64el ppc64el riscv64], Restrictions: allow-stderr needs-root isolation-container Tests: upstream -Depends: mariadb-test, eatmydata +Depends: + eatmydata, + mariadb-test, Restrictions: allow-stderr breaks-testbed diff --git a/debian/tests/traces/mariadb-verbose-help.expected b/debian/tests/traces/mariadb-verbose-help.expected index 015a0430..2c81bd35 100644 --- a/debian/tests/traces/mariadb-verbose-help.expected +++ b/debian/tests/traces/mariadb-verbose-help.expected @@ -19,8 +19,7 @@ The following specify which files/extra groups are read (specified before remain Abort 'source filename' operations in case of errors --auto-rehash Enable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup - and reconnecting may take a longer time. Disable with - --disable-auto-rehash. + and reconnecting may take a longer time. (Defaults to on; use --skip-auto-rehash to disable.) -A, --no-auto-rehash No automatic rehashing. One has to use 'rehash' to get @@ -32,27 +31,61 @@ The following specify which files/extra groups are read (specified before remain -B, --batch Don't use history file. Disable interactive behavior. (Enables --silent.) --binary-as-hex Print binary data as hex + --binary-mode Binary mode allows certain character sequences to be + processed as data that would otherwise be treated with a + special meaning by the parser. Specifically, this switch + turns off parsing of all client commands except \C and + DELIMITER in non-interactive mode (i.e., when binary mode + is combined with either 1) piped input, 2) the --batch + mysql option, or 3) the 'source' command). Also, in + binary mode, occurrences of '\r\n' and ASCII '\0' are + preserved within strings, whereas by default, '\r\n' is + translated to '\n' and '\0' is disallowed in user input. --character-sets-dir=name Directory for character set files. + --column-names Write column names in results. + (Defaults to on; use --skip-column-names to disable.) + -N, --skip-column-names + Don't write column names in results. --column-type-info Display column type information. -c, --comments Preserve comments. Send comments to the server. The default is --skip-comments (discard comments), enable with --comments. -C, --compress Use compression in server/client protocol. + --connect-expired-password + Notify the server that this client is prepared to handle + expired password sandbox mode even if --batch was + specified. + --connect-timeout=# Number of seconds before connection timeout. + -D, --database=name Database to use. -#, --debug[=#] This is a non-debug version. Catch this and exit. --debug-check Check memory and open file usage at exit. -T, --debug-info Print some debug info at exit. - -D, --database=name Database to use. + --default-auth=name Default authentication client-side plugin to use. --default-character-set=name Set the default character set. --delimiter=name Delimiter to be used. - -e, --execute=name Execute command and quit. (Disables --force and history - file.) --enable-cleartext-plugin Obsolete option. Exists only for MySQL compatibility. - -E, --vertical Print the output of a query (rows) vertically. + -e, --execute=name Execute command and quit. (Disables --force and history + file.) -f, --force Continue even if we get an SQL error. Sets abort-source-on-error to 0 + -h, --host=name Connect to host. + -H, --html Produce HTML output. + -i, --ignore-spaces Ignore space after function names. + --init-command=name SQL Command to execute when connecting to MariaDB server. + Will automatically be re-executed when reconnecting. + --line-numbers Write line numbers for errors. + (Defaults to on; use --skip-line-numbers to disable.) + -L, --skip-line-numbers + Don't write line number for errors. + --local-infile Enable LOAD DATA LOCAL INFILE. + --max-allowed-packet=# + The maximum packet length to send to or receive from + server. + --max-join-size=# Automatic limit for rows in a join when using + --safe-updates. -G, --named-commands Enable named commands. Named commands mean this program's internal commands; see mysql> help . When enabled, the @@ -60,24 +93,9 @@ The following specify which files/extra groups are read (specified before remain otherwise only from the first line, before an enter. Disable with --disable-named-commands. This option is disabled by default. - -i, --ignore-spaces Ignore space after function names. - --init-command=name SQL Command to execute when connecting to MariaDB server. - Will automatically be re-executed when reconnecting. - --local-infile Enable/disable LOAD DATA LOCAL INFILE. + --net-buffer-length=# + The buffer size for TCP/IP and socket communication. -b, --no-beep Turn off beep on error. - -h, --host=name Connect to host. - -H, --html Produce HTML output. - -X, --xml Produce XML output. - --line-numbers Write line numbers for errors. - (Defaults to on; use --skip-line-numbers to disable.) - -L, --skip-line-numbers - Don't write line number for errors. - -n, --unbuffered Flush buffer after each query. - --column-names Write column names in results. - (Defaults to on; use --skip-column-names to disable.) - -N, --skip-column-names - Don't write column names in results. - --sigint-ignore Ignore SIGINT (CTRL-C). -o, --one-database Ignore statements except those that occur while the default database is the one named at the command line. --pager[=name] Pager to use to display results. If you don't supply an @@ -89,6 +107,7 @@ The following specify which files/extra groups are read (specified before remain -p, --password[=name] Password to use when connecting to server. If password is not given it's asked from the tty. + --plugin-dir=name Directory for client-side plugins. -P, --port=# Port number to use for connection or 0 for default to, in order of preference, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306). @@ -101,9 +120,18 @@ The following specify which files/extra groups are read (specified before remain down the server if the output is suspended. Doesn't use history file. -r, --raw Write fields without conversion. Used with --batch. - --reconnect Reconnect if the connection is lost. Disable with - --disable-reconnect. This option is enabled by default. + --reconnect Reconnect if the connection is lost. (Defaults to on; use --skip-reconnect to disable.) + -U, --safe-updates Only allow UPDATE and DELETE that uses keys. + -U, --i-am-a-dummy Synonym for option --safe-updates, -U. + --sandbox Disallow commands that access the file system (except \P + without an argument and \e). + --secure-auth Refuse client connecting to server if it uses old + (pre-4.1.1) protocol. + --select-limit=# Automatic limit for SELECT when using --safe-updates. + --server-arg=name Send embedded server this as a parameter. + --show-warnings Show warnings after every statement. + --sigint-ignore Ignore SIGINT (CTRL-C). -s, --silent Be more silent. Print results with a tab as separator, each row on new line. -S, --socket=name The socket file to use for connection. @@ -127,41 +155,13 @@ The following specify which files/extra groups are read (specified before remain --tee=name Append everything into outfile. See interactive help (\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default. + -n, --unbuffered Flush buffer after each query. -u, --user=name User for login if not current user. - -U, --safe-updates Only allow UPDATE and DELETE that uses keys. - -U, --i-am-a-dummy Synonym for option --safe-updates, -U. -v, --verbose Write more. (-v -v -v gives the table output format). -V, --version Output version information and exit. + -E, --vertical Print the output of a query (rows) vertically. -w, --wait Wait and retry if connection is down. - --connect-timeout=# Number of seconds before connection timeout. - --max-allowed-packet=# - The maximum packet length to send to or receive from - server. - --net-buffer-length=# - The buffer size for TCP/IP and socket communication. - --select-limit=# Automatic limit for SELECT when using --safe-updates. - --max-join-size=# Automatic limit for rows in a join when using - --safe-updates. - --secure-auth Refuse client connecting to server if it uses old - (pre-4.1.1) protocol. - --server-arg=name Send embedded server this as a parameter. - --show-warnings Show warnings after every statement. - --plugin-dir=name Directory for client-side plugins. - --default-auth=name Default authentication client-side plugin to use. - --binary-mode Binary mode allows certain character sequences to be - processed as data that would otherwise be treated with a - special meaning by the parser. Specifically, this switch - turns off parsing of all client commands except \C and - DELIMITER in non-interactive mode (i.e., when binary mode - is combined with either 1) piped input, 2) the --batch - mysql option, or 3) the 'source' command). Also, in - binary mode, occurrences of '\r\n' and ASCII '\0' are - preserved within strings, whereas by default, '\r\n' is - translated to '\n' and '\0' is disallowed in user input. - --connect-expired-password - Notify the server that this client is prepared to handle - expired password sandbox mode even if --batch was - specified. + -X, --xml Produce XML output. Variables (--variable-name=value) and boolean options {FALSE|TRUE} Value (after reading options) @@ -170,29 +170,33 @@ abort-source-on-error FALSE auto-rehash TRUE auto-vertical-output FALSE binary-as-hex FALSE +binary-mode FALSE character-sets-dir (No default value) +column-names TRUE column-type-info FALSE comments FALSE compress FALSE +connect-expired-password FALSE +connect-timeout 0 +database (No default value) debug-check FALSE debug-info FALSE -database (No default value) +default-auth (No default value) default-character-set auto delimiter ; -vertical FALSE force FALSE -named-commands FALSE +host (No default value) +html FALSE ignore-spaces FALSE init-command (No default value) +line-numbers TRUE local-infile FALSE +max-allowed-packet 16777216 +max-join-size 1000000 +named-commands FALSE +net-buffer-length 16384 no-beep FALSE -host (No default value) -html FALSE -xml FALSE -line-numbers TRUE -unbuffered FALSE -column-names TRUE -sigint-ignore FALSE +plugin-dir (No default value) port 0 progress-reports TRUE prompt \N [\d]> @@ -200,6 +204,13 @@ protocol quick FALSE raw FALSE reconnect TRUE +safe-updates FALSE +i-am-a-dummy FALSE +sandbox FALSE +secure-auth FALSE +select-limit 1000 +show-warnings FALSE +sigint-ignore FALSE socket /run/mysqld/mysqld.sock ssl TRUE ssl-ca (No default value) @@ -212,17 +223,7 @@ ssl-crlpath (No default value) tls-version (No default value) ssl-verify-server-cert FALSE table FALSE +unbuffered FALSE user (No default value) -safe-updates FALSE -i-am-a-dummy FALSE -connect-timeout 0 -max-allowed-packet 16777216 -net-buffer-length 16384 -select-limit 1000 -max-join-size 1000000 -secure-auth FALSE -show-warnings FALSE -plugin-dir (No default value) -default-auth (No default value) -binary-mode FALSE -connect-expired-password FALSE +vertical FALSE +xml FALSE diff --git a/debian/tests/traces/mariadbd-verbose-help.expected b/debian/tests/traces/mariadbd-verbose-help.expected index 601e8828..1c0f4be9 100644 --- a/debian/tests/traces/mariadbd-verbose-help.expected +++ b/debian/tests/traces/mariadbd-verbose-help.expected @@ -886,6 +886,9 @@ The following specify which files/extra groups are read (specified before remain Redo log size in bytes. --innodb-log-group-home-dir=name Path to ib_logfile0 + --innodb-log-spin-wait-delay[=#] + Delay between log buffer spin lock polls (0 to use a + blocking latch) --innodb-lru-flush-size=# How many pages to flush on LRU eviction --innodb-lru-scan-depth=# @@ -964,6 +967,8 @@ The following specify which files/extra groups are read (specified before remain --innodb-rollback-on-timeout Roll back the complete transaction on lock wait timeout, for 4.x compatibility (disabled by default) + --innodb-snapshot-isolation + Use snapshot isolation (write-write conflict detection). --innodb-sort-buffer-size=# Memory buffer size for index creation --innodb-spin-wait-delay[=#] @@ -1426,13 +1431,17 @@ The following specify which files/extra groups are read (specified before remain max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors (Automatically configured unless set explicitly) - --optimizer-adjust-secondary-key-costs=# - 0 = No changes. 1 = Update secondary key costs for ranges - to be at least 5x of clustered primary key costs. 2 = - Remove 'max_seek optimization' for secondary keys and - slight adjustment of filter cost. This option will be - deleted in MariaDB 11.0 as it is not needed with the new - 11.0 optimizer. + --optimizer-adjust-secondary-key-costs=name + A bit field with the following values: + adjust_secondary_key_cost = Update secondary key costs + for ranges to be at least 5x of clustered primary key + costs. disable_max_seek = Disable 'max_seek optimization' + for secondary keys and slight adjustment of filter cost. + disable_forced_index_in_group_by = Disable automatic + forced index in GROUP BY. This variable will be deleted + in MariaDB 11.0 as it is not needed with the new 11.0 + optimizer. + Use 'ALL' to set all combinations. --optimizer-extra-pruning-depth=# If the optimizer needs to enumerate join prefix of this size or larger, then it will try aggressively prune away @@ -1479,7 +1488,7 @@ The following specify which files/extra groups are read (specified before remain extended_keys, exists_to_in, orderby_uses_equalities, condition_pushdown_for_derived, split_materialized, condition_pushdown_for_subquery, rowid_filter, - condition_pushdown_from_having, not_null_range_scan, + condition_pushdown_from_having, not_null_range_scan, hash_join_cardinality, cset_narrowing --optimizer-trace=name Controls tracing of the Optimizer: @@ -2658,6 +2667,7 @@ innodb-log-buffer-size 16777216 innodb-log-file-buffering FALSE innodb-log-file-size 100663296 innodb-log-group-home-dir (No default value) +innodb-log-spin-wait-delay 0 innodb-lru-flush-size 32 innodb-lru-scan-depth 1536 innodb-max-dirty-pages-pct 90 @@ -2689,6 +2699,7 @@ innodb-read-io-threads 4 innodb-read-only FALSE innodb-read-only-compressed FALSE innodb-rollback-on-timeout FALSE +innodb-snapshot-isolation FALSE innodb-sort-buffer-size 1048576 innodb-spin-wait-delay 4 innodb-stats-auto-recalc TRUE @@ -2829,7 +2840,7 @@ old-mode UTF8_IS_UTF8MB3 old-passwords FALSE old-style-user-limits FALSE open-files-limit 32000 -optimizer-adjust-secondary-key-costs 0 +optimizer-adjust-secondary-key-costs optimizer-extra-pruning-depth 8 optimizer-max-sel-arg-weight 32000 optimizer-max-sel-args 16000 @@ -2979,7 +2990,7 @@ slave-run-triggers-for-rbr NO slave-skip-errors OFF slave-sql-verify-checksum TRUE slave-transaction-retries 10 -slave-transaction-retry-errors 1158,1159,1160,1161,1205,1213,1429,2013,12701 +slave-transaction-retry-errors 1158,1159,1160,1161,1205,1213,1020,1429,2013,12701 slave-transaction-retry-interval 0 slave-type-conversions slow-launch-time 2 diff --git a/debian/tests/upstream b/debian/tests/upstream index a348e154..6dc864d3 100644 --- a/debian/tests/upstream +++ b/debian/tests/upstream @@ -45,14 +45,6 @@ main.mysqld--help : For unknown reason table-cache is 4000 instead of default 42 EOF fi -if [ "$ARCH" = "s390x" ] -then - echo "main.func_regexp_pcre : recursion fails on s390x https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1723947" >> "$MTR_SKIP_TEST_LIST" -elif [ "$ARCH" = "armhf" ] || [ "$ARCH" = "i386" ] -then - echo "main.failed_auth_unixsocket : Test returns wrong exit code on armhf and i386 (but only in debci) https://jira.mariadb.org/browse/MDEV-23933" >> "$MTR_SKIP_TEST_LIST" -fi - # Store skipped test list in artifacts so it can be viewed while debugging # failed autopkgtest runs cp -v "$MTR_SKIP_TEST_LIST" "$AUTOPKGTEST_ARTIFACTS" diff --git a/debian/unstable-tests.armhf b/debian/unstable-tests.armhf index 3974b331..11bf8337 100644 --- a/debian/unstable-tests.armhf +++ b/debian/unstable-tests.armhf @@ -1,7 +1,21 @@ +# MDEV-33381: The full test suite (including --big-test) has numerous failures +# on armhf and a Raspberry Pi enthusiast is needed to debug them +federated.federatedx_versioning : MDEV-33381 +index_intersect_innodb : MDEV-23921 +main.index_intersect : MDEV-23921 +main.join_cache_notasan : MDEV-34084 main.table_value_constr : MDEV-33520 main.xml : MDEV-21968 maria.maria-purge : MDEV-31349 +mariabackup.encrypted_page_corruption : Not reported upstream yet +period.versioning : MDEV-33381 +spider.basic_sql : MDEV-33381 +spider.spider_fixes_part : MDEV-33381 +spider/bg.basic_sql : MDEV-33381 +spider/bg.spider_fixes_part : MDEV-33381 type_test.type_test_double : MDEV-22243, but wasn't actually fixed yet unit.conc_connection : CONC-640: unit.conc_connection fails on test_conc21 -# The full test suite (including --big-test) has numerous failures on armhf and -# MariaDB is in desperate need of a Raspberry PI enthusiast to analyze them +versioning.autoinc : MDEV-33381 +versioning.online : MDEV-33381 +versioning.partition : MDEV-33381 +versioning.trx_id : MDEV-33381 diff --git a/debian/unstable-tests.hppa b/debian/unstable-tests.hppa index 3fa55709..d273b15e 100644 --- a/debian/unstable-tests.hppa +++ b/debian/unstable-tests.hppa @@ -1,3 +1,4 @@ +index_intersect_innodb : MDEV-23921 main.analyze_engine_stats : MDEV-32375 main.analyze_stmt_orderby : MDEV-32375 main.analyze_stmt_slow_query_log : MDEV-12237 @@ -6,8 +7,10 @@ main.derived_split_innodb : MDEV-32375 main.explain_json_format_partitions : MDEV-32375 main.func_json_notembedded : MDEV-27955 / MDEV-30518 / https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006529 (timeout) main.index_intersect : MDEV-23921 +main.index_intersect : MDEV-23921 main.index_intersect_innodb : MDEV-23921 main.join_cache_notasan : MDEV-31893 (fixed but perhaps not for hppa) +main.join_cache_notasan : MDEV-34084 main.rowid_filter_innodb : MDEV-32375 main.table_value_constr : MDEV-33520 maria.maria-purge : MDEV-31349 diff --git a/debian/unstable-tests.hurd-i386 b/debian/unstable-tests.hurd-i386 new file mode 120000 index 00000000..32dbff60 --- /dev/null +++ b/debian/unstable-tests.hurd-i386 @@ -0,0 +1 @@ +unstable-tests.hurd
\ No newline at end of file |