diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/additions/innotop/innotop | 15 | ||||
| -rwxr-xr-x | debian/additions/mariadb-report | 32 | ||||
| -rw-r--r-- | debian/additions/mariadb.conf.d/50-server.cnf | 4 | ||||
| -rw-r--r-- | debian/additions/source_mariadb-10.6.py (renamed from debian/additions/source_mariadb-10.5.py) | 4 | ||||
| -rwxr-xr-x | debian/autobake-deb.sh | 39 | ||||
| -rw-r--r-- | debian/changelog | 64 | ||||
| -rw-r--r-- | debian/control | 245 | ||||
| -rw-r--r-- | debian/mariadb-client-10.6.README.Debian (renamed from debian/mariadb-client-10.5.README.Debian) | 0 | ||||
| -rw-r--r-- | debian/mariadb-client-10.6.docs (renamed from debian/mariadb-client-10.5.docs) | 0 | ||||
| -rw-r--r-- | debian/mariadb-client-10.6.install (renamed from debian/mariadb-client-10.5.install) | 29 | ||||
| -rw-r--r-- | debian/mariadb-client-10.6.links (renamed from debian/mariadb-client-10.5.links) | 0 | ||||
| -rw-r--r-- | debian/mariadb-client-10.6.manpages (renamed from debian/mariadb-client-10.5.manpages) | 0 | ||||
| -rw-r--r-- | debian/mariadb-client-10.6.menu (renamed from debian/mariadb-client-10.5.menu) | 2 | ||||
| -rw-r--r-- | debian/mariadb-client-core-10.6.install (renamed from debian/mariadb-client-core-10.5.install) | 2 | ||||
| -rw-r--r-- | debian/mariadb-client-core-10.6.links (renamed from debian/mariadb-client-core-10.5.links) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.README.Debian (renamed from debian/mariadb-server-10.5.README.Debian) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.config (renamed from debian/mariadb-server-10.5.config) | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.dirs (renamed from debian/mariadb-server-10.5.dirs) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.install (renamed from debian/mariadb-server-10.5.install) | 33 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.links (renamed from debian/mariadb-server-10.5.links) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.logcheck.ignore.paranoid (renamed from debian/mariadb-server-10.5.logcheck.ignore.paranoid) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.logcheck.ignore.server (renamed from debian/mariadb-server-10.5.logcheck.ignore.server) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.logcheck.ignore.workstation (renamed from debian/mariadb-server-10.5.logcheck.ignore.workstation) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.mariadb.init (renamed from debian/mariadb-server-10.5.mariadb.init) | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.mysql-server.logrotate (renamed from debian/mariadb-server-10.5.mysql-server.logrotate) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.mysql.default (renamed from debian/mariadb-server-10.5.mysql.default) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.postinst (renamed from debian/mariadb-server-10.5.postinst) | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.postrm (renamed from debian/mariadb-server-10.5.postrm) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.preinst (renamed from debian/mariadb-server-10.5.preinst) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.prerm (renamed from debian/mariadb-server-10.5.prerm) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.templates (renamed from debian/mariadb-server-10.5.templates) | 6 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.triggers (renamed from debian/mariadb-server-10.5.triggers) | 0 | ||||
| -rw-r--r-- | debian/mariadb-server-core-10.6.install (renamed from debian/mariadb-server-core-10.5.install) | 3 | ||||
| -rw-r--r-- | debian/mariadb-server-core-10.6.links (renamed from debian/mariadb-server-core-10.5.links) | 0 | ||||
| -rw-r--r-- | debian/mariadb-test-data.install | 1 | ||||
| -rw-r--r-- | debian/mariadb-test-data.lintian-overrides | 1 | ||||
| -rw-r--r-- | debian/mariadb-test.install | 4 | ||||
| -rw-r--r-- | debian/mariadb-test.links | 6 | ||||
| -rw-r--r-- | debian/not-installed | 22 | ||||
| -rw-r--r-- | debian/po/POTFILES.in | 2 | ||||
| -rw-r--r-- | debian/po/ar.po | 22 | ||||
| -rw-r--r-- | debian/po/ca.po | 26 | ||||
| -rw-r--r-- | debian/po/cs.po | 24 | ||||
| -rw-r--r-- | debian/po/da.po | 30 | ||||
| -rw-r--r-- | debian/po/de.po | 24 | ||||
| -rw-r--r-- | debian/po/es.po | 22 | ||||
| -rw-r--r-- | debian/po/eu.po | 22 | ||||
| -rw-r--r-- | debian/po/fi.po | 28 | ||||
| -rw-r--r-- | debian/po/fr.po | 26 | ||||
| -rw-r--r-- | debian/po/gl.po | 22 | ||||
| -rw-r--r-- | debian/po/it.po | 28 | ||||
| -rw-r--r-- | debian/po/ja.po | 24 | ||||
| -rw-r--r-- | debian/po/nb.po | 22 | ||||
| -rw-r--r-- | debian/po/nl.po | 24 | ||||
| -rw-r--r-- | debian/po/pt.po | 24 | ||||
| -rw-r--r-- | debian/po/pt_BR.po | 28 | ||||
| -rw-r--r-- | debian/po/ro.po | 22 | ||||
| -rw-r--r-- | debian/po/ru.po | 24 | ||||
| -rw-r--r-- | debian/po/sv.po | 26 | ||||
| -rw-r--r-- | debian/po/templates.pot | 26 | ||||
| -rw-r--r-- | debian/po/tr.po | 24 | ||||
| -rw-r--r-- | debian/po/vi.po | 30 | ||||
| -rwxr-xr-x | debian/rules | 39 | ||||
| -rw-r--r-- | debian/salsa-ci.yml | 294 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 12 | ||||
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rw-r--r-- | debian/tests/smoke | 4 | ||||
| -rw-r--r-- | debian/tests/upstream | 3 |
68 files changed, 797 insertions, 625 deletions
diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 23f04fe017c..5d81980341d 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -987,12 +987,12 @@ sub parse_tx_text { # Parsing the line that begins 'MySQL thread id' is complicated. The only # thing always in the line is the thread and query id. See function # innobase_mysql_print_thd in InnoDB source file sql/ha_innodb.cc. - my ( $thread_line ) = $txn =~ m/^(MySQL thread id .*)$/m; + my ( $thread_line ) = $txn =~ m/^((?:MariaDB|MySQL) thread id .*)$/m; my ( $mysql_thread_id, $query_id, $hostname, $ip, $user, $query_status ); if ( $thread_line ) { # These parts can always be gotten. - ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^MySQL thread id $d, .*?query id $d/m; + ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^(?:MariaDB|MySQL) thread id $d, .*?query id $d/m; # If it's a master/slave thread, "Has (read|sent) all" may be the thread's # proc_info. In these cases, there won't be any host/ip/user info @@ -4144,15 +4144,16 @@ my $innodb_parser = InnoDBParser->new; my $nonfatal_errs = join('|', 'Access denied for user', - 'Unknown MySQL server host', + 'Unknown MariaDB server host', 'Unknown database', - 'Can\'t connect to local MySQL server through socket', - 'Can\'t connect to MySQL server on', + 'Can\'t connect to local MariaDB server through socket', + 'Can\'t connect to MariaDB server on', 'MySQL server has gone away', 'Cannot call SHOW INNODB STATUS', 'Access denied', 'AutoCommit', - 'Lost connection to MySQL server', + 'Lost connection to MariaDB server', + 'Lost connection to server', 'Too many connections', ); @@ -7692,7 +7693,7 @@ sub get_driver_status { sub get_new_db_connection { my ( $connection, $destroy ) = @_; if ( $file ) { - die "You can't connect to a MySQL server while monitoring a file. This is probably a bug."; + die "You can't connect to a MariaDB server while monitoring a file. This is probably a bug."; } my $dsn = $connections{$connection} diff --git a/debian/additions/mariadb-report b/debian/additions/mariadb-report index 665add394ca..ff73bb0e17e 100755 --- a/debian/additions/mariadb-report +++ b/debian/additions/mariadb-report @@ -142,7 +142,6 @@ my $have_innodb_vals = 1; # This might be set to 0 later in get_MySQL_version() my $have_aria_vals = 0; my $have_subquerycache_vals = 0; my $have_binlog_vals = 0; -my $have_tokudb_engine = 0; my $use_thread_pool = 0; if(defined $op{'r'}) @@ -720,15 +719,6 @@ sub get_MySQL_version } else { $have_binlog_vals = 0; } - - $have_tokudb_engine = $dbh->selectall_arrayref("SELECT SUPPORT FROM information_schema.engines WHERE ENGINE = 'TokuDB';", undef)->[0][0]; - if(defined($have_tokudb_engine) && ($have_tokudb_engine eq "YES" || $have_tokudb_engine eq "DEFAULT")) - { - print "TokuDB detected\n" if $op{debug}; - $have_tokudb_engine = 1; - } else { - $have_tokudb_engine = 0; - } } } @@ -933,7 +923,6 @@ sub write_report write_Aria() if $have_aria_vals; write_Subquerycache() if $have_subquerycache_vals; write_Binlog() if $have_binlog_vals; - write_TokuDB() if $have_tokudb_engine; } sub sec_to_dhms # Seconds to days+hours:minutes:seconds @@ -1205,16 +1194,6 @@ sub write_Binlog write; } -sub write_TokuDB -{ - print "write_TokuDB\n" if $op{debug}; - - return if $stats{'Tokudb_cachetable_size_current'} == 0; - - $~ = 'TOKUDB'; - write; -} - sub write_InnoDB { print "write_InnoDB\n" if $op{debug}; @@ -1604,17 +1583,6 @@ perc($binlog_cache_ratio) perc($binlog_stmt_cache_ratio) . -format TOKUDB = - -__ TokuDB ______________________________________________________________ -Cachetable @>>>>>> of @>>>>>> %Usage: @>>>>> -make_short($stats{Tokudb_cachetable_size_current}, 1), make_short($vars{tokudb_cache_size}, 1), perc($stats{Tokudb_cachetable_size_current}, $vars{tokudb_cache_size}) - Miss @>>>>>> @>>>>>/s -make_short($stats{'Tokudb_cachetable_miss'}), t($stats{'Tokudb_cachetable_miss'}) - Evictions @>>>>>> @>>>>>/s -make_short($stats{'Tokudb_cachetable_evictions'}), t($stats{'Tokudb_cachetable_evictions'}) -. - format ROWS = __ Rows ________________________________________________________________ diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf index 69aa8420f4f..c5a26bd42b2 100644 --- a/debian/additions/mariadb.conf.d/50-server.cnf +++ b/debian/additions/mariadb.conf.d/50-server.cnf @@ -108,7 +108,7 @@ collation-server = utf8mb4_general_ci # you can put MariaDB-only options here [mariadb] -# This group is only read by MariaDB-10.5 servers. +# This group is only read by MariaDB-10.6 servers. # If you use the same .cnf file for MariaDB of different versions, # use this group for options that older servers don't understand -[mariadb-10.5] +[mariadb-10.6] diff --git a/debian/additions/source_mariadb-10.5.py b/debian/additions/source_mariadb-10.6.py index eac7a054b84..43b1f35373e 100644 --- a/debian/additions/source_mariadb-10.5.py +++ b/debian/additions/source_mariadb-10.6.py @@ -1,4 +1,4 @@ -'''apport package hook for mariadb-10.5 +'''apport package hook for mariadb-10.6 (c) 2009 Canonical Ltd. Author: Mathias Gug <mathias.gug@canonical.com> @@ -21,7 +21,7 @@ def _add_my_conf_files(report, filename): continue def add_info(report): - attach_conffiles(report, 'mariadb-server-10.5', conffiles=None) + attach_conffiles(report, 'mariadb-server-10.6', conffiles=None) key = 'Logs' + path_to_key('/var/log/daemon.log') report[key] = "" for line in read_file('/var/log/daemon.log').split('\n'): diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 14e9214dde9..e0aecc9d8a8 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -54,6 +54,19 @@ remove_rocksdb_tools() fi } +replace_uring_with_aio() +{ + sed 's/liburing-dev/libaio-dev/g' -i debian/control + sed -e '/-DIGNORE_AIO_CHECK=YES/d' \ + -e '/-DWITH_URING=yes/d' -i debian/rules +} + +disable_pmem() +{ + sed '/libpmem-dev/d' -i debian/control + sed '/-DWITH_PMEM=yes/d' -i debian/rules +} + architecture=$(dpkg-architecture -q DEB_BUILD_ARCH) LSBID="$(lsb_release -si | tr '[:upper:]' '[:lower:]')" @@ -70,22 +83,38 @@ case "${LSBNAME}" in sed -e '/libzstd-dev/d' \ -e 's/libcurl4/libcurl3/g' -i debian/control remove_rocksdb_tools + disable_pmem ;& buster) + replace_uring_with_aio + if [ ! "$architecture" = amd64 ] + then + disable_pmem + fi ;& bullseye|bookworm) # mariadb-plugin-rocksdb in control is 4 arches covered by the distro rocksdb-tools # so no removal is necessary. + if [[ ! "$architecture" =~ amd64|arm64|ppc64el ]] + then + disable_pmem + fi + if [[ ! "$architecture" =~ amd64|arm64|armel|armhf|i386|mips64el|mipsel|ppc64el|s390x ]] + then + replace_uring_with_aio + fi ;& sid) # should always be empty here. # need to match here to avoid the default Error however ;; - # UBUNTU + # UBUNTU bionic) remove_rocksdb_tools + [ "$architecture" != amd64 ] && disable_pmem ;& focal) + replace_uring_with_aio ;& impish|jammy) # mariadb-plugin-rocksdb s390x not supported by us (yet) @@ -95,6 +124,14 @@ case "${LSBNAME}" in then remove_rocksdb_tools fi + if [[ ! "$architecture" =~ amd64|arm64|ppc64el ]] + then + disable_pmem + fi + if [[ ! "$architecture" =~ amd64|arm64|armhf|ppc64el|s390x ]] + then + replace_uring_with_aio + fi ;; *) echo "Error - unknown release codename $LSBNAME" >&2 diff --git a/debian/changelog b/debian/changelog index 581da3bc92f..08065467bdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,65 +1,5 @@ -mariadb-10.5 (1:10.5.0) unstable; urgency=low +mariadb-10.6 (1:10.6.0) unstable; urgency=medium * Initial Release - -- Vicentiu Ciorbaru <vicentiu@mariadb.org> Tue, 21 May 2019 13:27:19 +0000 - -mariadb-10.4 (1:10.4.0) unstable; urgency=low - - * Initial release. - - -- Otto Kekäläinen <otto@debian.org> Sun, 05 Aug 2018 00:06:30 -0500 - -mariadb-10.3 (1:10.3.0) unstable; urgency=low - - * Bump epoch to supersede 1:10.1.29-6 in Debian - - -- Otto Kekäläinen <otto@mariadb.org> Sat, 31 Mar 2018 22:34:34 +0300 - -mariadb-10.3 (10.3.0) unstable; urgency=low - - * Initial release. - - -- Vicențiu Ciorbaru <vicentiu@mariadb.org> Wed, 5 Apr 2017 21:18:02 +0200 - -mariadb-10.2 (10.2.0) unstable; urgency=low - - * Initial release. - - -- Otto Kekäläinen <otto@mariadb.org> Sat, 14 Nov 2015 21:26:45 +0200 - -mariadb-10.1 (10.1.0) unstable; urgency=low - - * Initial release. - - -- Sergei Golubchik <serg@askmonty.org> Fri, 23 May 2014 09:44:38 -0200 - -mariadb-10.0 (10.0.0) unstable; urgency=low - - * Initial release. - - -- Sergei Golubchik <serg@askmonty.org> Sat, 20 Oct 2012 17:18:44 -0100 - -mariadb-5.5 (5.5.1) unstable; urgency=low - - * Initial release. - - -- Kristian Nielsen <knielsen@askmonty.org> Fri, 6 Jan 2012 15:17:23 -0100 - -mariadb-5.3 (5.3.0) unstable; urgency=low - - * Initial release. - - -- Sergei Golubchik <serg@askmonty.org> Mon, 1 Nov 2010 09:16:01 -0100 - -mariadb-5.2 (5.2.0) unstable; urgency=low - - * Initial release. - - -- Kristian Nielsen <knielsen@askmonty.org> Wed, 17 Mar 2010 12:54:51 -0100 - -mariadb-5.1 (5.1.0) unstable; urgency=low - - * Initial release. - - -- Peter Lieverdink <peter@openquery.com> Tue, 29 Sep 2009 17:05:03 +1000 + -- Otto Kekäläinen <otto@debian.org> Thu, 14 May 2020 18:00:57 +0300 diff --git a/debian/control b/debian/control index 5352e9902ed..7f0d88e991c 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: mariadb-10.5 +Source: mariadb-10.6 Section: database Priority: optional Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> @@ -31,10 +31,12 @@ Build-Depends: bison, 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, lsb-release, @@ -58,12 +60,16 @@ Depends: libmariadb3 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}, ${shlibs:Depends} -Conflicts: libmariadbclient16-dev +Conflicts: libmariadb-dev-compat (<< 3.0.0), + libmariadbclient-dev, + libmariadbclient16-dev Provides: libmariadbclient-dev -Breaks: libmariadbclient-dev, +Breaks: libmariadb-client-lgpl-dev, libmysqlclient-dev (<< ${source:Version}), libmysqld-dev (<< ${source:Version}) -Replaces: libmariadbclient-dev, +Replaces: libmariadb-client-lgpl-dev, + libmariadb-dev-compat (<< 3.0.0), + libmariadbclient-dev, libmysqlclient-dev (<< ${source:Version}), libmysqld-dev (<< ${source:Version}) Description: MariaDB database development files @@ -82,7 +88,8 @@ Multi-Arch: same Section: libdevel Depends: libmariadb-dev (= ${binary:Version}), ${misc:Depends} -Conflicts: libmariadb-client-lgpl-dev-compat, +Conflicts: libmariadb-client-lgpl-dev, + libmariadb-client-lgpl-dev-compat, libmariadbclient-dev-compat, libmysqlclient-dev, libmysqlclient10-dev, @@ -93,7 +100,10 @@ Conflicts: libmariadb-client-lgpl-dev-compat, Provides: libmariadb-client-lgpl-dev-compat, libmariadbclient-dev-compat, libmysqlclient-dev -Replaces: libmariadb-client-lgpl-dev-compat, +Breaks: libmariadb-dev (<< ${source:Version}) +Replaces: libmariadb-client-lgpl-dev, + libmariadb-client-lgpl-dev-compat, + libmariadb-dev (<< ${source:Version}), libmariadbclient-dev-compat, libmysqlclient-dev Description: MariaDB Connector/C, compatibility symlinks @@ -249,7 +259,7 @@ Description: MariaDB common configuration files . This package includes configuration files common to all MariaDB programs. -Package: mariadb-client-core-10.5 +Package: mariadb-client-core-10.6 Architecture: any Depends: libmariadb3 (>= 10.5.4), mariadb-common (>= ${source:Version}), @@ -260,7 +270,8 @@ Conflicts: mariadb-client-10.0, mariadb-client-10.2, mariadb-client-10.3, mariadb-client-10.4, - mariadb-client-10.5 (<< ${source:Version}), + mariadb-client-10.5, + mariadb-client-10.6 (<< ${source:Version}), mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -270,6 +281,7 @@ Conflicts: mariadb-client-10.0, mariadb-client-core-10.2, mariadb-client-core-10.3, mariadb-client-core-10.4, + mariadb-client-core-10.5, mariadb-client-core-5.1, mariadb-client-core-5.2, mariadb-client-core-5.3, @@ -284,12 +296,29 @@ Conflicts: mariadb-client-10.0, mysql-client-core-5.7, mysql-client-core-8.0, virtual-mysql-client-core +Breaks: mariadb-server-10.0, + mariadb-server-10.1, + 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 (<< ${source:Version}), + 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.0, mariadb-client-10.1, mariadb-client-10.2, mariadb-client-10.3, mariadb-client-10.4, - mariadb-client-10.5 (<< ${source:Version}), + mariadb-client-10.5, + mariadb-client-10.6 (<< ${source:Version}), mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -299,10 +328,20 @@ Replaces: mariadb-client-10.0, mariadb-client-core-10.2, mariadb-client-core-10.3, mariadb-client-core-10.4, + mariadb-client-core-10.5, mariadb-client-core-5.1, mariadb-client-core-5.2, mariadb-client-core-5.3, mariadb-client-core-5.5, + mariadb-server-10.0, + mariadb-server-10.1, + 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 (<< ${source:Version}), mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, @@ -312,6 +351,13 @@ Replaces: mariadb-client-10.0, mysql-client-core-5.6, mysql-client-core-5.7, mysql-client-core-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-client-core Provides: default-mysql-client-core, virtual-mysql-client-core @@ -323,10 +369,10 @@ Description: MariaDB database core client binaries . This package includes the core client files, as used by Akonadi. -Package: mariadb-client-10.5 +Package: mariadb-client-10.6 Architecture: any Depends: debianutils (>=1.6), - mariadb-client-core-10.5 (>= ${source:Version}), + mariadb-client-core-10.6 (>= ${source:Version}), mariadb-common, ${misc:Depends}, ${perl:Depends}, @@ -337,7 +383,8 @@ Conflicts: mariadb-client (<< ${source:Version}), mariadb-client-10.2, mariadb-client-10.3, mariadb-client-10.4, - mariadb-client-10.5 (<< ${source:Version}), + mariadb-client-10.5, + mariadb-client-10.6 (<< ${source:Version}), mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -362,14 +409,40 @@ Breaks: mariadb-client-core-10.0, mariadb-client-core-10.2, mariadb-client-core-10.3, mariadb-client-core-10.4, - mariadb-client-core-10.5 (<< ${source:Version}) + mariadb-client-core-10.5, + mariadb-client-core-10.6 (<< ${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, + mariadb-server-10.6 (<< ${source:Version}), + 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 (<< ${source:Version}), + mysql-server-5.5, + mysql-server-5.6, + mysql-server-5.7, + mysql-server-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 Replaces: mariadb-client (<< ${source:Version}), mariadb-client-10.0, mariadb-client-10.1, mariadb-client-10.2, mariadb-client-10.3, mariadb-client-10.4, - mariadb-client-10.5 (<< ${source:Version}), + mariadb-client-10.5, mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, @@ -379,8 +452,22 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-client-core-10.2, mariadb-client-core-10.3, mariadb-client-core-10.4, - mariadb-client-core-10.5 (<< ${source:Version}), - mariadb-server-10.5 (<< ${source:Version}), + mariadb-client-core-10.5, + mariadb-client-core-10.6 (<< ${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, + mariadb-server-10.6 (<< ${source:Version}), + 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 (<< ${source:Version}), mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, @@ -394,7 +481,18 @@ Replaces: mariadb-client (<< ${source:Version}), mysql-client-core-5.6, mysql-client-core-5.7, mysql-client-core-8.0, + mysql-server-5.5, + mysql-server-5.6, + mysql-server-5.7, + mysql-server-8.0, + mysql-server-core-5.5, + mysql-server-core-5.6, + mysql-server-core-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: default-mysql-client, virtual-mysql-client @@ -410,7 +508,7 @@ Description: MariaDB database client binaries This package includes the client binaries and the additional tools innotop and mariadb-report (mysqlreport). -Package: mariadb-server-core-10.5 +Package: mariadb-server-core-10.6 Architecture: any Depends: mariadb-common (>= ${source:Version}), ${misc:Depends}, @@ -420,6 +518,7 @@ Conflicts: mariadb-server-core-10.0, mariadb-server-core-10.2, mariadb-server-core-10.3, mariadb-server-core-10.4, + mariadb-server-core-10.5, mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, @@ -437,32 +536,48 @@ Breaks: mariadb-client-10.0, mariadb-client-10.2, mariadb-client-10.3, mariadb-client-10.4, - mariadb-client-10.5 (<< ${source:Version}), + mariadb-client-10.5, + mariadb-client-10.6 (<< ${source:Version}), + mariadb-server-10.0, + mariadb-server-10.1, mariadb-server-10.3, mariadb-server-10.4, - mariadb-server-10.5 (<< ${source:Version}), + mariadb-server-10.5, + mariadb-server-10.6 (<< ${source:Version}), + mysql-client-5.5, + mysql-server-5.5, mysql-server-5.6, mysql-server-5.7, - mysql-server-8.0 + mysql-server-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 (<< ${source:Version}), + mariadb-client-10.5, + mariadb-client-10.6 (<< ${source:Version}), + mariadb-server-10.0, + mariadb-server-10.1, mariadb-server-10.3, mariadb-server-10.4, - mariadb-server-10.5 (<< ${source:Version}), + mariadb-server-10.5, + mariadb-server-10.6 (<< ${source:Version}), 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-5.1, mariadb-server-core-5.2, mariadb-server-core-5.3, mariadb-server-core-5.5, + mysql-client-5.5, mysql-server-5.0, + mysql-server-5.5, mysql-server-5.6, mysql-server-5.7, mysql-server-8.0, @@ -472,6 +587,9 @@ Replaces: mariadb-client-10.0, 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: default-mysql-server-core, virtual-mysql-server-core @@ -483,7 +601,7 @@ Description: MariaDB database core server files . This package includes the core server files, as used by Akonadi. -Package: mariadb-server-10.5 +Package: mariadb-server-10.6 Architecture: any Suggests: mailx, mariadb-test, @@ -498,8 +616,8 @@ Depends: galera-4 (>= 26.4), libdbi-perl, lsb-base (>= 3.0-10), lsof [linux-any], - mariadb-client-10.5 (>= ${source:Version}), - mariadb-server-core-10.5 (>= ${server:Version}), + mariadb-client-10.6 (>= ${source:Version}), + mariadb-server-core-10.6 (>= ${source:Version}), passwd, perl (>= 5.6), procps, @@ -515,6 +633,7 @@ Conflicts: mariadb-server (<< ${source:Version}), mariadb-server-10.2, mariadb-server-10.3, mariadb-server-10.4, + mariadb-server-10.5, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, @@ -537,15 +656,22 @@ Conflicts: mariadb-server (<< ${source:Version}), mysql-server-core-5.7, mysql-server-core-8.0, virtual-mysql-server -Replaces: libmariadbclient-dev (<< 5.5.0), +Breaks: handlersocket-mysql-5.5, + percona-server-server-5.6, + percona-xtradb-cluster-server-5.6, + percona-xtradb-cluster-server-5.7 +Replaces: handlersocket-mysql-5.5, + libmariadbclient-dev (<< 5.5.0), libmariadbclient16, - mariadb-client-10.5 (<< ${source:Version}), + mariadb-client-10.5, + mariadb-client-10.6 (<< ${source:Version}), 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, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, @@ -563,6 +689,9 @@ Replaces: libmariadbclient-dev (<< 5.5.0), 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: default-mysql-server, virtual-mysql-server @@ -576,11 +705,11 @@ Description: MariaDB database server binaries Package: mariadb-server Architecture: all -Depends: mariadb-server-10.5 (>= ${source:Version}), +Depends: mariadb-server-10.6 (>= ${source:Version}), ${misc:Depends} Description: MariaDB database server (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-server (currently mariadb-server-10.5), as determined by the MariaDB + mariadb-server (currently mariadb-server-10.6), as determined by the MariaDB maintainers. Install this package if in doubt about which MariaDB version you need. That will install the version recommended by the package maintainers. @@ -592,21 +721,23 @@ Description: MariaDB database server (metapackage depending on the latest versio Package: mariadb-client Architecture: all -Depends: mariadb-client-10.5 (>= ${source:Version}), +Depends: mariadb-client-10.6 (>= ${source:Version}), ${misc:Depends} Description: MariaDB database client (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-client (currently mariadb-client-10.5), as determined by the MariaDB + mariadb-client (currently mariadb-client-10.6), as determined by the MariaDB maintainers. Install this package if in doubt about which MariaDB version you want, as this is the one considered to be in the best shape. Package: mariadb-backup Architecture: any Breaks: mariadb-backup-10.1, - mariadb-backup-10.2 + mariadb-backup-10.2, + mariadb-client-10.1 Replaces: mariadb-backup-10.1, - mariadb-backup-10.2 -Depends: mariadb-client-core-10.5 (= ${binary:Version}), + mariadb-backup-10.2, + mariadb-client-10.1 +Depends: mariadb-client-core-10.6 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Backup tool for MariaDB server @@ -619,15 +750,17 @@ Description: Backup tool for MariaDB server Package: mariadb-plugin-connect Architecture: any Depends: libxml2, - mariadb-server-10.5 (= ${server:Version}), + mariadb-server-10.6 (= ${server:Version}), unixodbc, ${misc:Depends}, ${shlibs:Depends} -Breaks: mariadb-connect-engine-10.1, +Breaks: mariadb-connect-engine-10.0, + mariadb-connect-engine-10.1, mariadb-connect-engine-10.2, mariadb-connect-engine-10.3, mariadb-connect-engine-10.4 -Replaces: mariadb-connect-engine-10.1, +Replaces: mariadb-connect-engine-10.0, + mariadb-connect-engine-10.1, mariadb-connect-engine-10.2, mariadb-connect-engine-10.3, mariadb-connect-engine-10.4 @@ -640,7 +773,7 @@ Description: Connect storage engine for MariaDB Package: mariadb-plugin-s3 Architecture: any Depends: libcurl4, - mariadb-server-10.5 (= ${server:Version}), + mariadb-server-10.6 (= ${server:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Amazon S3 archival storage engine for MariaDB @@ -650,7 +783,7 @@ Description: Amazon S3 archival storage engine for MariaDB Package: mariadb-plugin-rocksdb Architecture: amd64 arm64 mips64el ppc64el -Depends: mariadb-server-10.5 (= ${server:Version}), +Depends: mariadb-server-10.6 (= ${server:Version}), python3, rocksdb-tools, ${misc:Depends}, @@ -670,14 +803,16 @@ Description: RocksDB storage engine for MariaDB Package: mariadb-plugin-oqgraph Architecture: any Depends: libjudydebian1, - mariadb-server-10.5 (= ${server:Version}), + mariadb-server-10.6 (= ${server:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: mariadb-oqgraph-engine-10.1, +Breaks: mariadb-oqgraph-engine-10.0, + mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2, mariadb-oqgraph-engine-10.3, mariadb-oqgraph-engine-10.4 -Replaces: mariadb-oqgraph-engine-10.1, +Replaces: mariadb-oqgraph-engine-10.0, + mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2, mariadb-oqgraph-engine-10.3, mariadb-oqgraph-engine-10.4 @@ -688,7 +823,7 @@ Description: OQGraph storage engine for MariaDB 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 any-tilegx -Depends: mariadb-server-10.5 (= ${server:Version}), +Depends: mariadb-server-10.6 (= ${server:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-server-10.0, @@ -708,7 +843,7 @@ Description: Mroonga storage engine for MariaDB Package: mariadb-plugin-spider Architecture: any -Depends: mariadb-server-10.5 (= ${server:Version}), +Depends: mariadb-server-10.6 (= ${server:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-server-10.0, @@ -730,7 +865,7 @@ Description: Spider storage engine for MariaDB Package: mariadb-plugin-gssapi-server Architecture: any Depends: libgssapi-krb5-2, - mariadb-server-10.5, + mariadb-server-10.6, ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-gssapi-server-10.1, @@ -751,7 +886,7 @@ Package: mariadb-plugin-gssapi-client Architecture: any Multi-Arch: same Depends: libgssapi-krb5-2, - mariadb-client-10.5 (= ${binary:Version}), + mariadb-client-10.6 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-gssapi-client-10.1, @@ -771,7 +906,7 @@ Description: GSSAPI authentication plugin for MariaDB client Package: mariadb-plugin-cracklib-password-check Architecture: any Depends: libcrack2 (>= 2.9.0), - mariadb-server-10.5, + mariadb-server-10.6, ${misc:Depends}, ${shlibs:Depends} Description: CrackLib Password Validation Plugin for MariaDB @@ -782,8 +917,8 @@ Description: CrackLib Password Validation Plugin for MariaDB Package: mariadb-test Architecture: any -Depends: mariadb-client-10.5 (= ${binary:Version}), - mariadb-server-10.5 (= ${server:Version}), +Depends: mariadb-client-10.6 (= ${binary:Version}), + mariadb-server-10.6 (= ${server:Version}), mariadb-test-data (= ${source:Version}), virtual-mysql-testsuite, ${misc:Depends}, @@ -799,24 +934,34 @@ Breaks: mariadb-server-5.5, mariadb-test-10.3, mariadb-test-10.4, 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 + 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-10.2, mariadb-test-10.3, mariadb-test-10.4, mariadb-test-5.5, + mysql-client-5.5, + mysql-server-5.5, 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 diff --git a/debian/mariadb-client-10.5.README.Debian b/debian/mariadb-client-10.6.README.Debian index 64f0f509951..64f0f509951 100644 --- a/debian/mariadb-client-10.5.README.Debian +++ b/debian/mariadb-client-10.6.README.Debian diff --git a/debian/mariadb-client-10.5.docs b/debian/mariadb-client-10.6.docs index c09092629c3..c09092629c3 100644 --- a/debian/mariadb-client-10.5.docs +++ b/debian/mariadb-client-10.6.docs diff --git a/debian/mariadb-client-10.5.install b/debian/mariadb-client-10.6.install index b299d3034c9..3a92ded15b6 100644 --- a/debian/mariadb-client-10.5.install +++ b/debian/mariadb-client-10.6.install @@ -5,35 +5,64 @@ debian/additions/mariadb.conf.d/50-mysql-clients.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d usr/bin/mariadb-access usr/bin/mariadb-admin +usr/bin/mariadb-binlog usr/bin/mariadb-conv +usr/bin/mariadb-convert-table-format usr/bin/mariadb-dump usr/bin/mariadb-dumpslow usr/bin/mariadb-find-rows usr/bin/mariadb-fix-extensions +usr/bin/mariadb-hotcopy usr/bin/mariadb-import +usr/bin/mariadb-plugin +usr/bin/mariadb-secure-installation +usr/bin/mariadb-setpermission usr/bin/mariadb-show usr/bin/mariadb-slap +usr/bin/mariadb-tzinfo-to-sql usr/bin/mariadb-waitpid +usr/bin/msql2mysql usr/bin/mytop +usr/bin/perror +usr/bin/replace +usr/bin/resolve_stack_dump usr/share/man/man1/mariadb-access.1 usr/share/man/man1/mariadb-admin.1 +usr/share/man/man1/mariadb-binlog.1 usr/share/man/man1/mariadb-conv.1 +usr/share/man/man1/mariadb-convert-table-format.1 usr/share/man/man1/mariadb-dump.1 usr/share/man/man1/mariadb-dumpslow.1 usr/share/man/man1/mariadb-find-rows.1 usr/share/man/man1/mariadb-fix-extensions.1 +usr/share/man/man1/mariadb-hotcopy.1 usr/share/man/man1/mariadb-import.1 +usr/share/man/man1/mariadb-plugin.1 +usr/share/man/man1/mariadb-secure-installation.1 +usr/share/man/man1/mariadb-setpermission.1 usr/share/man/man1/mariadb-show.1 usr/share/man/man1/mariadb-slap.1 +usr/share/man/man1/mariadb-tzinfo-to-sql.1 usr/share/man/man1/mariadb-waitpid.1 +usr/share/man/man1/msql2mysql.1 +usr/share/man/man1/mysql_convert_table_format.1 usr/share/man/man1/mysql_find_rows.1 usr/share/man/man1/mysql_fix_extensions.1 +usr/share/man/man1/mysql_plugin.1 +usr/share/man/man1/mysql_secure_installation.1 +usr/share/man/man1/mysql_setpermission.1 +usr/share/man/man1/mysql_tzinfo_to_sql.1 usr/share/man/man1/mysql_waitpid.1 usr/share/man/man1/mysqlaccess.1 usr/share/man/man1/mysqladmin.1 +usr/share/man/man1/mysqlbinlog.1 usr/share/man/man1/mysqldump.1 usr/share/man/man1/mysqldumpslow.1 +usr/share/man/man1/mysqlhotcopy.1 usr/share/man/man1/mysqlimport.1 usr/share/man/man1/mysqlshow.1 usr/share/man/man1/mysqlslap.1 usr/share/man/man1/mytop.1 +usr/share/man/man1/perror.1 +usr/share/man/man1/replace.1 +usr/share/man/man1/resolve_stack_dump.1 diff --git a/debian/mariadb-client-10.5.links b/debian/mariadb-client-10.6.links index bc42197629b..bc42197629b 100644 --- a/debian/mariadb-client-10.5.links +++ b/debian/mariadb-client-10.6.links diff --git a/debian/mariadb-client-10.5.manpages b/debian/mariadb-client-10.6.manpages index 8735caeea8b..8735caeea8b 100644 --- a/debian/mariadb-client-10.5.manpages +++ b/debian/mariadb-client-10.6.manpages diff --git a/debian/mariadb-client-10.5.menu b/debian/mariadb-client-10.6.menu index bb9d6f9076d..90280215b8b 100644 --- a/debian/mariadb-client-10.5.menu +++ b/debian/mariadb-client-10.6.menu @@ -1,3 +1,3 @@ # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/ -?package(mariadb-client-10.5):needs="text" section="Applications/Data Management"\ +?package(mariadb-client-10.6):needs="text" section="Applications/Data Management"\ title="Innotop" command="/usr/bin/innotop" diff --git a/debian/mariadb-client-core-10.5.install b/debian/mariadb-client-core-10.6.install index 224e324b704..421b62d2a1a 100644 --- a/debian/mariadb-client-core-10.5.install +++ b/debian/mariadb-client-core-10.6.install @@ -1,6 +1,8 @@ usr/bin/mariadb usr/bin/mariadb-check +usr/bin/my_print_defaults usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb.1 +usr/share/man/man1/my_print_defaults.1 usr/share/man/man1/mysql.1 usr/share/man/man1/mysqlcheck.1 diff --git a/debian/mariadb-client-core-10.5.links b/debian/mariadb-client-core-10.6.links index 5134dd814b5..5134dd814b5 100644 --- a/debian/mariadb-client-core-10.5.links +++ b/debian/mariadb-client-core-10.6.links diff --git a/debian/mariadb-server-10.5.README.Debian b/debian/mariadb-server-10.6.README.Debian index 6042249a706..6042249a706 100644 --- a/debian/mariadb-server-10.5.README.Debian +++ b/debian/mariadb-server-10.6.README.Debian diff --git a/debian/mariadb-server-10.5.config b/debian/mariadb-server-10.6.config index ccf9fe94239..27e2e9f4929 100644 --- a/debian/mariadb-server-10.5.config +++ b/debian/mariadb-server-10.6.config @@ -9,6 +9,6 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } # Beware that there are two ypwhich one of them needs the 2>/dev/null! if test -n "`which ypwhich 2>/dev/null`" && ypwhich >/dev/null 2>&1; then - db_input high mariadb-server-10.5/nis_warning || true + db_input high mariadb-server-10.6/nis_warning || true db_go fi diff --git a/debian/mariadb-server-10.5.dirs b/debian/mariadb-server-10.6.dirs index 5057fe806c3..5057fe806c3 100644 --- a/debian/mariadb-server-10.5.dirs +++ b/debian/mariadb-server-10.6.dirs diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.6.install index 874e2ff19bf..4d15f5d8e54 100644 --- a/debian/mariadb-server-10.5.install +++ b/debian/mariadb-server-10.6.install @@ -3,7 +3,7 @@ debian/additions/debian-start.inc.sh usr/share/mysql debian/additions/echo_stderr usr/share/mysql debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d -debian/additions/source_mariadb-10.5.py usr/share/apport/package-hooks +debian/additions/source_mariadb-10.6.py usr/share/apport/package-hooks etc/apparmor.d/usr.sbin.mariadbd etc/security/user_map.conf lib/*/security/pam_user_map.so @@ -18,25 +18,14 @@ usr/bin/aria_pack usr/bin/aria_read_log usr/bin/galera_new_cluster usr/bin/galera_recovery -usr/bin/mariadb-binlog -usr/bin/mariadb-convert-table-format -usr/bin/mariadb-hotcopy -usr/bin/mariadb-plugin -usr/bin/mariadb-secure-installation usr/bin/mariadb-service-convert -usr/bin/mariadb-setpermission -usr/bin/mariadb-tzinfo-to-sql usr/bin/mariadbd-multi usr/bin/mariadbd-safe usr/bin/mariadbd-safe-helper -usr/bin/msql2mysql usr/bin/myisam_ftdump usr/bin/myisamchk usr/bin/myisamlog usr/bin/myisampack -usr/bin/perror -usr/bin/replace -usr/bin/resolve_stack_dump usr/bin/wsrep_sst_common usr/bin/wsrep_sst_mariabackup usr/bin/wsrep_sst_mysqldump @@ -63,7 +52,7 @@ usr/lib/mysql/plugin/simple_password_check.so usr/lib/mysql/plugin/sql_errlog.so usr/lib/mysql/plugin/type_mysql_json.so usr/lib/mysql/plugin/wsrep_info.so -usr/share/doc/mariadb-server-10.5/mariadbd.sym.gz +usr/share/doc/mariadb-server-10.6/mariadbd.sym.gz usr/share/man/man1/aria_chk.1 usr/share/man/man1/aria_dump_log.1 usr/share/man/man1/aria_ftdump.1 @@ -71,35 +60,17 @@ usr/share/man/man1/aria_pack.1 usr/share/man/man1/aria_read_log.1 usr/share/man/man1/galera_new_cluster.1 usr/share/man/man1/galera_recovery.1 -usr/share/man/man1/mariadb-binlog.1 -usr/share/man/man1/mariadb-convert-table-format.1 -usr/share/man/man1/mariadb-hotcopy.1 -usr/share/man/man1/mariadb-plugin.1 -usr/share/man/man1/mariadb-secure-installation.1 usr/share/man/man1/mariadb-service-convert.1 -usr/share/man/man1/mariadb-setpermission.1 -usr/share/man/man1/mariadb-tzinfo-to-sql.1 usr/share/man/man1/mariadbd-multi.1 usr/share/man/man1/mariadbd-safe-helper.1 usr/share/man/man1/mariadbd-safe.1 -usr/share/man/man1/msql2mysql.1 usr/share/man/man1/myisam_ftdump.1 usr/share/man/man1/myisamchk.1 usr/share/man/man1/myisamlog.1 usr/share/man/man1/myisampack.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysqlbinlog.1 usr/share/man/man1/mysqld_multi.1 usr/share/man/man1/mysqld_safe.1 usr/share/man/man1/mysqld_safe_helper.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolve_stack_dump.1 usr/share/man/man1/wsrep_sst_common.1 usr/share/man/man1/wsrep_sst_mariabackup.1 usr/share/man/man1/wsrep_sst_mysqldump.1 diff --git a/debian/mariadb-server-10.5.links b/debian/mariadb-server-10.6.links index 9cc3a436ba8..9cc3a436ba8 100644 --- a/debian/mariadb-server-10.5.links +++ b/debian/mariadb-server-10.6.links diff --git a/debian/mariadb-server-10.5.logcheck.ignore.paranoid b/debian/mariadb-server-10.6.logcheck.ignore.paranoid index 407d4063270..407d4063270 100644 --- a/debian/mariadb-server-10.5.logcheck.ignore.paranoid +++ b/debian/mariadb-server-10.6.logcheck.ignore.paranoid diff --git a/debian/mariadb-server-10.5.logcheck.ignore.server b/debian/mariadb-server-10.6.logcheck.ignore.server index a64fc54e15c..a64fc54e15c 100644 --- a/debian/mariadb-server-10.5.logcheck.ignore.server +++ b/debian/mariadb-server-10.6.logcheck.ignore.server diff --git a/debian/mariadb-server-10.5.logcheck.ignore.workstation b/debian/mariadb-server-10.6.logcheck.ignore.workstation index a64fc54e15c..a64fc54e15c 100644 --- a/debian/mariadb-server-10.5.logcheck.ignore.workstation +++ b/debian/mariadb-server-10.6.logcheck.ignore.workstation diff --git a/debian/mariadb-server-10.5.mariadb.init b/debian/mariadb-server-10.6.mariadb.init index d2c5c64165a..a16e9f88edb 100644 --- a/debian/mariadb-server-10.5.mariadb.init +++ b/debian/mariadb-server-10.6.mariadb.init @@ -165,7 +165,7 @@ case "${1:-''}" in if ! mariadbd_status check_dead warn; then log_end_msg 1 - log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.5/README.Debian.gz!" + log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.6/README.Debian.gz!" exit -1 else log_end_msg 0 diff --git a/debian/mariadb-server-10.5.mysql-server.logrotate b/debian/mariadb-server-10.6.mysql-server.logrotate index 11e4480c427..11e4480c427 100644 --- a/debian/mariadb-server-10.5.mysql-server.logrotate +++ b/debian/mariadb-server-10.6.mysql-server.logrotate diff --git a/debian/mariadb-server-10.5.mysql.default b/debian/mariadb-server-10.6.mysql.default index 36079edecb2..36079edecb2 100644 --- a/debian/mariadb-server-10.5.mysql.default +++ b/debian/mariadb-server-10.6.mysql.default diff --git a/debian/mariadb-server-10.5.postinst b/debian/mariadb-server-10.6.postinst index 13800b7bce2..93a1e4e8b87 100644 --- a/debian/mariadb-server-10.5.postinst +++ b/debian/mariadb-server-10.6.postinst @@ -115,7 +115,7 @@ EOF if [ -f "$mysql_datadir"/auto.cnf ] && [ -f "$mysql_datadir"/mysql/user.MYD ] && [ ! 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';" | - /usr/sbin/mariadbd --skip-innodb --key_buffer_size=0 --default-storage-engine=MyISAM --bootstrap 2> /dev/null + mariadbd --skip-innodb --key_buffer_size=0 --default-storage-engine=MyISAM --bootstrap 2> /dev/null fi # Ensure the existence and right permissions for the database and diff --git a/debian/mariadb-server-10.5.postrm b/debian/mariadb-server-10.6.postrm index 94ce91db31d..94ce91db31d 100644 --- a/debian/mariadb-server-10.5.postrm +++ b/debian/mariadb-server-10.6.postrm diff --git a/debian/mariadb-server-10.5.preinst b/debian/mariadb-server-10.6.preinst index 79c6ccc8500..79c6ccc8500 100644 --- a/debian/mariadb-server-10.5.preinst +++ b/debian/mariadb-server-10.6.preinst diff --git a/debian/mariadb-server-10.5.prerm b/debian/mariadb-server-10.6.prerm index 8fd172da9d2..8fd172da9d2 100644 --- a/debian/mariadb-server-10.5.prerm +++ b/debian/mariadb-server-10.6.prerm diff --git a/debian/mariadb-server-10.5.templates b/debian/mariadb-server-10.6.templates index 7644d06bd44..32e908c71e9 100644 --- a/debian/mariadb-server-10.5.templates +++ b/debian/mariadb-server-10.6.templates @@ -7,7 +7,7 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: mariadb-server-10.5/old_data_directory_saved +Template: mariadb-server-10.6/old_data_directory_saved Type: note _Description: The old data directory will be saved at new location A file named /var/lib/mysql/debian-*.flag exists on this system. @@ -19,7 +19,7 @@ _Description: The old data directory will be saved at new location . Please manually export/import your data (e.g. with mysqldump) if needed. -Template: mariadb-server-10.5/nis_warning +Template: mariadb-server-10.6/nis_warning Type: note #flag:translate!:3,5 _Description: Important note for NIS/YP users @@ -33,7 +33,7 @@ _Description: Important note for NIS/YP users . /var/lib/mysql: drwxr-xr-x mysql mysql -Template: mariadb-server-10.5/postrm_remove_databases +Template: mariadb-server-10.6/postrm_remove_databases Type: boolean Default: false _Description: Remove all MariaDB databases? diff --git a/debian/mariadb-server-10.5.triggers b/debian/mariadb-server-10.6.triggers index d1f5f5e14f1..d1f5f5e14f1 100644 --- a/debian/mariadb-server-10.5.triggers +++ b/debian/mariadb-server-10.6.triggers diff --git a/debian/mariadb-server-core-10.5.install b/debian/mariadb-server-core-10.6.install index a71f745fd2b..def95268512 100644 --- a/debian/mariadb-server-core-10.5.install +++ b/debian/mariadb-server-core-10.6.install @@ -1,13 +1,11 @@ usr/bin/innochecksum usr/bin/mariadb-install-db usr/bin/mariadb-upgrade -usr/bin/my_print_defaults usr/bin/resolveip usr/sbin/mariadbd usr/share/man/man1/innochecksum.1 usr/share/man/man1/mariadb-install-db.1 usr/share/man/man1/mariadb-upgrade.1 -usr/share/man/man1/my_print_defaults.1 usr/share/man/man1/mysql_install_db.1 usr/share/man/man1/mysql_upgrade.1 usr/share/man/man1/resolveip.1 @@ -32,6 +30,7 @@ usr/share/mysql/japanese usr/share/mysql/korean usr/share/mysql/maria_add_gis_sp_bootstrap.sql usr/share/mysql/mysql_performance_tables.sql +usr/share/mysql/mysql_sys_schema.sql usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_system_tables_data.sql usr/share/mysql/mysql_test_data_timezone.sql diff --git a/debian/mariadb-server-core-10.5.links b/debian/mariadb-server-core-10.6.links index c2be98f38fb..c2be98f38fb 100644 --- a/debian/mariadb-server-core-10.5.links +++ b/debian/mariadb-server-core-10.6.links diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install index 26b69c2941b..718fc0e122c 100644 --- a/debian/mariadb-test-data.install +++ b/debian/mariadb-test-data.install @@ -4,4 +4,3 @@ usr/share/mysql/mysql-test/main usr/share/mysql/mysql-test/plugin usr/share/mysql/mysql-test/std_data usr/share/mysql/mysql-test/suite -usr/share/mysql/mysql-test/unstable-tests diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides index 2fb5bc6e604..de210af2a39 100644 --- a/debian/mariadb-test-data.lintian-overrides +++ b/debian/mariadb-test-data.lintian-overrides @@ -26,7 +26,6 @@ repeated-path-segment rocksdb usr/share/mysql/mysql-test/plugin/rocksdb/rocksdb/ repeated-path-segment sequence usr/share/mysql/mysql-test/plugin/sequence/sequence/ repeated-path-segment sphinx usr/share/mysql/mysql-test/plugin/sphinx/sphinx/ repeated-path-segment spider usr/share/mysql/mysql-test/plugin/spider/spider/ -repeated-path-segment tokudb usr/share/mysql/mysql-test/plugin/tokudb/tokudb/ repeated-path-segment type_inet usr/share/mysql/mysql-test/plugin/type_inet/type_inet/ repeated-path-segment type_test usr/share/mysql/mysql-test/plugin/type_test/type_test/ repeated-path-segment user_variables usr/share/mysql/mysql-test/plugin/user_variables/user_variables/ diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index 5276e3e1bca..36b49bdab97 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -26,7 +26,6 @@ usr/share/man/man1/mariadb-client-test-embedded.1 usr/share/man/man1/mariadb-client-test.1 usr/share/man/man1/mariadb-test-embedded.1 usr/share/man/man1/mariadb-test.1 -usr/share/man/man1/mysql-stress-test.pl.1 usr/share/man/man1/mysql-test-run.pl.1 usr/share/man/man1/mysql_client_test.1 usr/share/man/man1/mysql_client_test_embedded.1 @@ -37,8 +36,9 @@ usr/share/mysql/mysql-test/README-gcov usr/share/mysql/mysql-test/README.stress usr/share/mysql/mysql-test/dgcov.pl usr/share/mysql/mysql-test/lib -usr/share/mysql/mysql-test/mysql-stress-test.pl +usr/share/mysql/mysql-test/mariadb-stress-test.pl usr/share/mysql/mysql-test/mysql-test-run.pl +usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/purify.supp usr/share/mysql/mysql-test/suite.pm usr/share/mysql/mysql-test/valgrind.supp diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links index 718a5355474..3c45bb955c4 100644 --- a/debian/mariadb-test.links +++ b/debian/mariadb-test.links @@ -2,5 +2,7 @@ usr/bin/mariadb-client-test usr/bin/mysql_client_test usr/bin/mariadb-client-test-embedded usr/bin/mysql_client_test_embedded usr/bin/mariadb-test usr/bin/mysqltest usr/bin/mariadb-test-embedded usr/bin/mysqltest_embedded -usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr -usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run +usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run.pl +usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run +usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mtr +usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mariadb-test-run diff --git a/debian/not-installed b/debian/not-installed index 58cd337212b..6924c9ad1a5 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,6 +1,10 @@ etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed lib/systemd/system/mariadb.service # Installed by rules file +lib/systemd/system/mariadb.socket # Installed by rules file +lib/systemd/system/mariadb-extra.socket # Installed by rules file lib/systemd/system/mariadb@.service # Installed by rules file +lib/systemd/system/mariadb@.socket # Installed by rules file +lib/systemd/system/mariadb-extra@.socket # Installed by rules file usr/bin/mysql_config # We already have the MariaDB variant usr/bin/mytop # Mytop is distributed from a separate source package usr/bin/sst_dump # Use the one from rocksdb-tools package @@ -12,15 +16,15 @@ usr/lib/*/libdbbc.a # ColumnStore header file usr/lib/*/libidbboot.a # ColumnStore header file usr/lib/*/libprocessor.a # ColumnStore header file usr/lib/*/libwe_xml.a # ColumnStore header file -usr/share/doc/mariadb-server-10.5/COPYING -usr/share/doc/mariadb-server-10.5/COPYING.AGPLv3 -usr/share/doc/mariadb-server-10.5/COPYING.GPLv2 -usr/share/doc/mariadb-server-10.5/COPYING.thirdparty -usr/share/doc/mariadb-server-10.5/CREDITS -usr/share/doc/mariadb-server-10.5/EXCEPTIONS-CLIENT -usr/share/doc/mariadb-server-10.5/INSTALL-BINARY -usr/share/doc/mariadb-server-10.5/PATENTS -usr/share/doc/mariadb-server-10.5/README-wsrep +usr/share/doc/mariadb-server-10.6/COPYING +usr/share/doc/mariadb-server-10.6/COPYING.AGPLv3 +usr/share/doc/mariadb-server-10.6/COPYING.GPLv2 +usr/share/doc/mariadb-server-10.6/COPYING.thirdparty +usr/share/doc/mariadb-server-10.6/CREDITS +usr/share/doc/mariadb-server-10.6/EXCEPTIONS-CLIENT +usr/share/doc/mariadb-server-10.6/INSTALL-BINARY +usr/share/doc/mariadb-server-10.6/PATENTS +usr/share/doc/mariadb-server-10.6/README-wsrep usr/share/groonga/COPYING usr/share/groonga-normalizer-mysql/lgpl-2.0.txt usr/share/groonga-normalizer-mysql/README.md diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index 662c4be9fbc..17bbe40ee92 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] mariadb-server-10.5.templates +[type: gettext/rfc822deb] mariadb-server-10.6.templates diff --git a/debian/po/ar.po b/debian/po/ar.po index a172e23b6db..8512209efbb 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: templates\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2007-05-01 13:04+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" @@ -27,13 +27,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -42,7 +42,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -50,20 +50,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "ملاحظة هامة لمستخدمي NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -71,7 +71,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -83,13 +83,13 @@ msgstr "عليك أيضاً أن تقوم بالتأكد من صلاحيات م #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "إزالة جميع قواعد بيانات MariaDB؟" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -97,7 +97,7 @@ msgstr "الدليل /var/lib/mysql الذي يحتوي قواعد بيانات #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/ca.po b/debian/po/ca.po index 8a966fdc348..d9c69e19983 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -1,12 +1,12 @@ # mariadb (debconf) translation to Catalan. -# his file is distributed under the same license as the mariadb-10.5 package. +# his file is distributed under the same license as the mariadb-10.6 package. # Aleix Badia i Bosch <abadia@ica.es> 2004 # Innocent De Marchi <tangram.peces@gmail.com> 2017 # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2017-03-20 17:55+0100\n" "Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "El directori de dades antigues es desarà a una nova localització" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -37,7 +37,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -47,7 +47,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -56,13 +56,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota important pels usuaris de «NIS/YP»" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -72,7 +72,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Eliminar totes les bases de dades MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -98,7 +98,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/cs.po b/debian/po/cs.po index 6ca00c08d6f..8176d86457b 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -13,8 +13,8 @@ # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2020-10-18 17:13+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" @@ -26,13 +26,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Starý adresář s daty bude uložen na novém místě." #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -44,7 +44,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -54,7 +54,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -63,13 +63,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Důležitá poznámka pro uživatele NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -79,7 +79,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -88,13 +88,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Odstranit všechny MariaDB databáze?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -104,7 +104,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/da.po b/debian/po/da.po index c4fa4788d24..4de2e4e7057 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,13 +1,13 @@ -# Danish translation mariadb-10.5. -# Copyright (C) 2014 mariadb-10.5 og nedenstående oversættere. -# This file is distributed under the same license as the mariadb-10.5 package. +# Danish translation mariadb-10.6. +# Copyright (C) 2014 mariadb-10.6 og nedenstående oversættere. +# This file is distributed under the same license as the mariadb-10.6 package. # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2005, 2006, 2007. # Joe Hansen <joedalton2@yahoo.dk>, 2014, 2016. # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2016-07-09 22:41+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Den gamle datamappe vil blive gemt på en ny placering" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -37,7 +37,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -47,7 +47,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -56,13 +56,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Vigtig oplysning til NIS/YP-brugere" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -72,7 +72,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Fjern alle MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -98,7 +98,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/de.po b/debian/po/de.po index 5f5e2865036..2228a07e27d 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,4 +1,4 @@ -# German translation of mariadb-10.5 10.0.13-1 +# German translation of mariadb-10.6 10.0.13-1 # Alwin Meschede <ameschede@gmx.de>, 2006, 2007. # Thomas Mueller <thomas.mueller@tmit.eu>, 2009. # Chris Leick <c.leick@vollbio.de>, 2014-2016. @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mariadb 10.0.25-1\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2016-05-12 22:39+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Das alte Datenverzeichnis wird an einer neuen Stelle gespeichert" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -37,7 +37,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -47,7 +47,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -56,13 +56,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -72,7 +72,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Alle MariaDB-Datenbanken entfernen?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -98,7 +98,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/es.po b/debian/po/es.po index 2f9e2be3566..db5a8bbf7a6 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -40,7 +40,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2016-04-30 21:26+0200\n" "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n" @@ -54,13 +54,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Se guardará el directorio antiguo de datos a la nueva ubicación" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -72,7 +72,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -82,7 +82,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -91,13 +91,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para los usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -107,7 +107,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -117,13 +117,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Desea eliminar todas las bases de datos MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -133,7 +133,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/eu.po b/debian/po/eu.po index d13eb07c53a..191d92b615e 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2009-07-29 11:59+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -35,7 +35,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -43,20 +43,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -64,7 +64,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -78,13 +78,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ezabatu MariaDB datubase guztiak?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -93,7 +93,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/fi.po b/debian/po/fi.po index 3a9dcc7f033..16e310b8c6a 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -1,11 +1,11 @@ -# Finnish translations for mariadb-10.5 package -# This file is distributed under the same license as the mariadb-10.5 package. +# Finnish translations for mariadb-10.6 package +# This file is distributed under the same license as the mariadb-10.6 package. # Antti Järvinen <antti.jarvinen@katiska.org>, 2017. # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2017-03-15 22:36+0200\n" "Last-Translator: antti.jarvinen@katiska.org\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Vanha datahakemisto tullaan tallentamaan uuteen paikkaan" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -37,7 +37,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -47,7 +47,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -56,13 +56,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Merkittävä huomio NIS/YP -käyttäjille" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -72,7 +72,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -80,13 +80,13 @@ msgstr "Tarkista myös hakemiston /var/lib/mysql omistaja ja oikeudet:" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Poistetaanko kaikki MariaDB-tietokannat?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -95,7 +95,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/fr.po b/debian/po/fr.po index 9da3302a0e8..1604203696b 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,6 +1,6 @@ -# Translation of mariadb-10.5 debconf templates to French +# Translation of mariadb-10.6 debconf templates to French # Copyright (C) 2004-2016 Debian French l10n team <debian-l10n-french@lists.debian.org> -# This file is distributed under the same license as the mariadb-10.5 packages. +# This file is distributed under the same license as the mariadb-10.6 packages. # # Translators: # Christian Perrier <bubulle@debian.org>, 2004, 2006, 2007, 2009, 2013. @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2016-12-31 18:35+0100\n" "Last-Translator: Baptiste Jammet <baptiste@mailoo.org>\n" @@ -23,13 +23,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "L'ancien répertoire de données sera sauvegardé à un nouvel emplacement" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -41,7 +41,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -51,7 +51,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -60,13 +60,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Note importante pour les utilisateurs NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -76,7 +76,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -86,13 +86,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Faut-il supprimer toutes les bases de données MariaDB ?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -102,7 +102,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/gl.po b/debian/po/gl.po index 0a6492eff19..d84a745a732 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2007-04-20 09:44+0200\n" "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" @@ -17,13 +17,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -32,7 +32,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -40,20 +40,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para os usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -61,7 +61,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -75,13 +75,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Eliminar tódalas bases de datos de MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -91,7 +91,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/it.po b/debian/po/it.po index e9d1cd8a63f..54b9e980b1c 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,11 +1,11 @@ -# Italian (it) translation of debconf templates for mariadb-10.5 -# This file is distributed under the same license as the mariadb-10.5 package. +# Italian (it) translation of debconf templates for mariadb-10.6 +# This file is distributed under the same license as the mariadb-10.6 package. # Luca Monducci <luca.mo@tiscali.it>, 2006-2017. # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5 10.0.13 Italian debconf templates\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6 10.0.13 Italian debconf templates\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2017-083-20 20:29+0100\n" "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" @@ -17,13 +17,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "La vecchia directory data verrà salvata in una nuova posizione" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -35,7 +35,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -45,7 +45,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -54,13 +54,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante per gli utenti NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -70,7 +70,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -80,13 +80,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Eliminare tutti i database MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +96,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/ja.po b/debian/po/ja.po index a39bdaf0594..c7a3bea42ce 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,8 +15,8 @@ # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5 10.0.32-1\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6 10.0.32-1\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2016-05-01 11:27+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" @@ -30,13 +30,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "古いデータディレクトリは、新しい場所に保存されます" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -48,7 +48,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -58,7 +58,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -67,13 +67,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP ユーザへの重要な注意" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -83,7 +83,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -91,13 +91,13 @@ msgstr "/var/lib/mysql の所有者権限をチェックする必要もありま #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "すべての MariaDB データベースを削除しますか?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -107,7 +107,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/nb.po b/debian/po/nb.po index d6d864d62d4..b11a70c3a0e 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql_nb\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2007-02-18 12:13+0100\n" "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -42,14 +42,14 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -57,7 +57,7 @@ msgstr "Viktig merknad for NIS/YP-brukere!" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -65,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -73,13 +73,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -87,7 +87,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " diff --git a/debian/po/nl.po b/debian/po/nl.po index 93c4a88ef31..90e6ea767bb 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,13 +1,13 @@ # Dutch mariadb-10 po-debconf translation, # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the mariadb-10.5 package. +# This file is distributed under the same license as the mariadb-10.6 package. # Vincent Zweije <zweije@xs4all.nl>, 2006. # Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2016, 2018. # msgid "" msgstr "" "Project-Id-Version: mariadb-10.2.7-1\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2018-03-29 21:25+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" @@ -21,13 +21,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "De oude data-map zal op een nieuwe locatie bewaard worden" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -39,7 +39,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -49,7 +49,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -58,13 +58,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Belangrijke opmerking voor gebruikers van NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -74,7 +74,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -84,13 +84,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Wilt u alle MariaDB-databases verwijderen?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -100,7 +100,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/pt.po b/debian/po/pt.po index 4141ad57182..4df8e3540a8 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2017-08-06 10:00+0100\n" "Last-Translator: Rui Branco <ruipb@debianpt.org>\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "O antigo directório de data será guardado num novo local" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -38,7 +38,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -48,7 +48,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -57,13 +57,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para os utilizadores de NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -73,7 +73,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -98,7 +98,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index f644e9c30d1..cf8127236e5 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -1,12 +1,12 @@ -# Debconf translations for mariadb-10.5. -# This file is distributed under the same license as the mariadb-10.5 package. +# Debconf translations for mariadb-10.6. +# This file is distributed under the same license as the mariadb-10.6 package. # André Luís Lopes, <andrelop@debian.org>, 2005-2007. # Adriano Rafael Gomes <adrianorg@arg.eti.br>, 2015-2016. # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2016-04-30 16:16-0300\n" "Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "O diretório de dados antigo será salvo em novo local" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -37,7 +37,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -47,7 +47,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -56,13 +56,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Aviso importante para usuários NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -72,7 +72,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados do MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -98,7 +98,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/ro.po b/debian/po/ro.po index a9a6a6b665d..869a5efddd2 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: po-debconf://mysql-dfsg\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2006-12-20 21:27+0200\n" "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -42,14 +42,14 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -57,7 +57,7 @@ msgstr "Notă importantă pentru utilizatorii NIS/YP!" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -65,7 +65,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -73,13 +73,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -87,7 +87,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " diff --git a/debian/po/ru.po b/debian/po/ru.po index 6d5e145082d..01152031369 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -6,8 +6,8 @@ # Yuri Kozlov <yuray@komyakino.ru>, 2009, 2014, 2016. msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5 10.0.25-1\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6 10.0.25-1\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2016-05-04 18:56+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" @@ -22,13 +22,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Каталог со старыми данными будет сохранён в новом месте" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -40,7 +40,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -51,7 +51,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -60,13 +60,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Важное замечание для пользователей NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -76,7 +76,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -84,13 +84,13 @@ msgstr "Также проверьте права доступа и владел #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Удалить все базы данных MariaDB?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -99,7 +99,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/sv.po b/debian/po/sv.po index 574d473be52..0c44b9923df 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,13 +1,13 @@ -# Translation of mariadb-10.5 debconf template to Swedish +# Translation of mariadb-10.6 debconf template to Swedish # Copyright (C) 2017 Martin Bagge <brother@bsnet.se> -# This file is distributed under the same license as the mariadb-10.5 package. +# This file is distributed under the same license as the mariadb-10.6 package. # # Andreas Henriksson <andreas@fatal.se>, 2007 # Martin Bagge <brother@bsnet.se>, 2009, 2015, 2017 msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2017-03-23 09:20+0100\n" "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Den gamla data-katalogen kommer att sparas till en ny plats" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -38,7 +38,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -48,7 +48,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -57,13 +57,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Viktig information för NIS/YP-användare" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -73,7 +73,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -83,13 +83,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ta bort alla MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -99,7 +99,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 22da4290b90..73febcc0174 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the mariadb-10.5 package. +# This file is distributed under the same license as the mariadb-10.6 package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -42,20 +42,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -63,7 +63,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -71,13 +71,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -85,7 +85,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/tr.po b/debian/po/tr.po index 51adf72573e..9d292dad46c 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2017-03-16 13:16+0300\n" "Last-Translator: Atila KOÇ <koc@artielektronik.com.tr>\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Eski veritabanı dizini yeni konumuna kaydedilecektir" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -38,7 +38,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -48,20 +48,20 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "Gerektiğinde verinizi elle (ör. mysqldump ile) içe/dışa aktarın." #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP kullanıcıları için önemli not" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -71,7 +71,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -81,13 +81,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Tüm MariaDB veritabanları kaldırılsın mı?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +96,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/po/vi.po b/debian/po/vi.po index 2db592acdc2..3aa7e3f3d25 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -1,12 +1,12 @@ -# Vietnamese translations for mariadb-10.5 package -# Bản dịch Tiếng Việt dành cho gói mariadb-10.5. -# This file is distributed under the same license as the mariadb-10.5 package. +# Vietnamese translations for mariadb-10.6 package +# Bản dịch Tiếng Việt dành cho gói mariadb-10.6. +# This file is distributed under the same license as the mariadb-10.6 package. # Trần Ngọc Quân <vnwildman@gmail.com>, 2017. # msgid "" msgstr "" -"Project-Id-Version: mariadb-10.5\n" -"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"Project-Id-Version: mariadb-10.6\n" +"Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n" "POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2017-03-18 13:32+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "The old data directory will be saved at new location" msgstr "Thư mục dữ liệu cũ sẽ được lưu tại vị trí mới" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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 " @@ -38,7 +38,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.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." @@ -48,7 +48,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:2001 +#: ../mariadb-server-10.6.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" @@ -57,13 +57,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "Important note for NIS/YP users" msgstr "Chú ý quan trọng cho người dùng NIS/YP" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -73,7 +73,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-server-10.5.templates:3001 +#: ../mariadb-server-10.6.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Xóa bỏ mọi cơ sở dữ liệu MariaDB chứ?" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -98,7 +98,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-server-10.5.templates:4001 +#: ../mariadb-server-10.6.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, " diff --git a/debian/rules b/debian/rules index 57636eb028a..aaca566d557 100755 --- a/debian/rules +++ b/debian/rules @@ -48,6 +48,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64)) CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=NO endif +# Cross building requires stack direction instruction ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) ifneq (,$(filter $(DEB_HOST_ARCH_CPU),alpha amd64 arm arm64 i386 ia64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64)) CMAKEFLAGS += -DSTACK_DIRECTION=-1 @@ -57,6 +58,12 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) endif endif +# Only attempt to build with PMEM on archs that have package libpmem-dev available +# See https://packages.debian.org/search?searchon=names&keywords=libpmem-dev +ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64 ppc64el riscv64)) + CMAKEFLAGS += -DWITH_PMEM=yes +endif + # Add support for verbose builds MAKEFLAGS += VERBOSE=1 @@ -64,11 +71,7 @@ override_dh_auto_clean: @echo "RULES.$@" dh_testdir dh_testroot - rm -rf $(BUILDDIR) builddir-native - - [ ! -f debian/mysql-test-unstable-tests.orig ] || \ - mv debian/mysql-test-unstable-tests.orig mysql-test/unstable-tests - + rm -rf $(BUILDDIR) builddir-native mysql-test/unstable-tests debconf-updatepo # Update po-files when clean runs before each build override_dh_auto_configure: @@ -97,10 +100,11 @@ endif -DSYSTEM_TYPE="debian-$(DEB_HOST_GNU_SYSTEM)" \ -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \ -DBUILD_CONFIG=mysql_release \ - -DPLUGIN_TOKUDB=NO \ - -DPLUGIN_CASSANDRA=NO \ + -DCONC_DEFAULT_CHARSET=utf8mb4 \ -DPLUGIN_AWS_KEY_MANAGEMENT=NO \ -DPLUGIN_COLUMNSTORE=NO \ + -DIGNORE_AIO_CHECK=YES \ + -DWITH_URING=yes \ -DDEB=$(DEB_VENDOR) # This is needed, otherwise 'make test' will run before binaries have been built @@ -113,8 +117,7 @@ override_dh_auto_build: override_dh_auto_test: @echo "RULES.$@" dh_testdir - # Skip unstable tests if such are defined for arch - cp mysql-test/unstable-tests debian/mysql-test-unstable-tests.orig + touch mysql-test/unstable-tests [ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_ARCH) >> mysql-test/unstable-tests # Run testsuite ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -131,8 +134,12 @@ override_dh_auto_install: ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS))) # Copy systemd files to a location available for dh_installinit - cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.5.mariadb.service - cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.5.mariadb@.service + cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.6.mariadb.service + cp $(BUILDDIR)/support-files/mariadb.socket debian/mariadb-server-10.6.mariadb.socket + cp $(BUILDDIR)/support-files/mariadb-extra.socket debian/mariadb-server-10.6.mariadb-extra.socket + cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.6.mariadb@.service + cp $(BUILDDIR)/support-files/mariadb@.socket debian/mariadb-server-10.6.mariadb@.socket + cp $(BUILDDIR)/support-files/mariadb-extra@.socket debian/mariadb-server-10.6.mariadb-extra@.socket endif # Run 'make install' without output since it is uninteresting and @@ -151,7 +158,7 @@ endif # nm numeric soft is not enough, therefore extra sort in command # to satisfy Debian reproducible build requirements - nm --defined-only $(BUILDDIR)/sql/mariadbd | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.5/mariadbd.sym.gz + nm --defined-only $(BUILDDIR)/sql/mariadbd | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.6/mariadbd.sym.gz # Rename and install AppArmor profile install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mariadbd @@ -181,9 +188,13 @@ override_dh_installlogrotate-arch: override_dh_systemd_enable: dh_systemd_enable --name=mariadb - dh_systemd_enable --no-enable --name=mariadb@ + dh_systemd_enable --no-enable --name=mariadb mariadb.socket + dh_systemd_enable --no-enable --name=mariadb-extra mariadb-extra.socket + dh_systemd_enable --no-enable --name=mariadb@ mariadb.socket + dh_systemd_enable --no-enable --name=mariadb-extra@ mariadb-extra.socket + dh_systemd_enable --no-enable --name=mariadb@ mariadb@.service -# Start mysql at sequence number 19 before 20 where apache, proftpd etc gets +# Start MariaDB at sequence number 19 before 20 where apache, proftpd etc gets # started which might depend on a running database server. override_dh_installinit-arch: dh_installinit --name=mariadb --no-start -- defaults 19 21 diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 6fc90193e06..3a69c45ead9 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -7,7 +7,7 @@ include: # Override Salsa-CI with MariaDB specific variations variables: DEB_BUILD_OPTIONS: "nocheck noautodbgsym" - RELEASE: bullseye + RELEASE: sid SALSA_CI_DISABLE_REPROTEST: 1 SALSA_CI_DISABLE_MISSING_BREAKS: 0 SALSA_CI_DISABLE_RC_BUGS: 1 @@ -20,8 +20,8 @@ stages: - provisioning - build - test - - upgrade in Bullseye - - upgrade from Buster/Stretch + - upgrade in Sid + - upgrade from Bullseye/Buster - upgrade extras - test extras - publish # Stage referenced by Salsa-CI template aptly stanza, so must exist even though not used @@ -46,23 +46,24 @@ build: - ccache -s # Show ccache stats to validate it worked - mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR} -# build jobs often needs more than default GitLab timeout (1h) -.build-package: - timeout: 3h - -build buster-backports: +build bullseye-backports: extends: .build-package - script: - - *autobake-deb-steps variables: - RELEASE: buster-backports + RELEASE: bullseye-backports -build stretch-backports: +build buster-backports: extends: .build-package script: + # Increase default backports priority policy from '100' to '500' so it can actually be used + - | + cat << EOF > /etc/apt/preferences.d/enable-backports-to-satisfy-dependencies + Package: * + Pin: release n=buster-* + Pin-Priority: 500 + EOF - *autobake-deb-steps variables: - RELEASE: stretch-backports + RELEASE: buster-backports # base image missing git build i386: @@ -74,9 +75,17 @@ build i386: variables: ARCH: 'i386' +# Build native deb without using autobake-deb.sh. This way we will detect +# if the debian/control file and other packaging is correct as-is for Debian Sid. build native deb: extends: .build-package +autopkgtest: + extends: .test-autopkgtest + artifacts: + reports: + junit: ${WORKING_DIR}/debci/artifacts/mysql-test-run-junit.xml + piuparts: extends: .test-piuparts stage: test extras @@ -84,6 +93,7 @@ piuparts: blhc: extends: .test-blhc stage: test extras + # Build log checker needs a .build file and thus only works on native build needs: - job: build native deb @@ -102,6 +112,12 @@ blhc: # Prime the apt cache so later apt commands can run apt-get update +# Readline was removed from Debian Sid (and Bullseye) in Feb 2021. To be able to install older +# versions of MariaDB that depend on it, fetch and install it from Buster. +.test-install-readline-in-sid-for-backwards-compat: &test-install-readline-in-sid-for-backwards-compat | + curl -O http://ftp.de.debian.org/debian/pool/main/r/readline5/libreadline5_5.2+dfsg-3+b13_amd64.deb + apt install -y ./libreadline5_5.2+dfsg-3+b13_amd64.deb + .test-verify-initial: &test-verify-initial | dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed service mysql status || service mariadb status # Early MariaDB 10.5 only had 'mariadb' @@ -111,9 +127,9 @@ blhc: mysql --table -e "SELECT * FROM plugin;" mysql mysql --table -e "SHOW PLUGINS;" mysql -.test-enable-bullseye-repos: &test-enable-bullseye-repos | - # Replace any old repos with just Bullseye - echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list +.test-enable-sid-repos: &test-enable-sid-repos | + # Replace any old repos with just Sid + echo 'deb http://deb.debian.org/debian sid main' > /etc/apt/sources.list # Upgrade minimal stack first apt-get update apt-get install -y apt @@ -146,6 +162,40 @@ blhc: - pkg-config --cflags --libs libmariadb - pkg-config --cflags --libs mariadb - apt-get install -y --no-install-recommends g++ + - | + # Build a test binary that depends on libmysqlclient + cat > b933063.cpp <<EOF + #include <iostream> + #include <mysql/mysql.h> + #include <stdexcept> + int main() + { + MYSQL h; + if (!mysql_init(&h) + || mysql_options(&h, MYSQL_READ_DEFAULT_GROUP, "") + // || mysql_options(&h, MYSQL_SET_CHARSET_NAME, "utf8mb4") + || !mysql_real_connect(&h, "", "", NULL, "", 0, NULL, 0)) + throw std::runtime_error(mysql_error(&h)); + std::string q = "show variables like '%char%'"; + if (mysql_real_query(&h, q.data(), q.size())) + throw std::runtime_error(mysql_error(&h)); + MYSQL_RES* result = mysql_store_result(&h); + if (!result && mysql_errno(&h)) + throw std::runtime_error(mysql_error(&h)); + while (MYSQL_ROW row = mysql_fetch_row(result)) + { + std::cout << row[0] << ": " << row[1] << "\n"; + } + return 0; + } + EOF + apt-get install -y ./*.deb # Server must be installed for client to connect + echo "Testing -l mysqlclient" + g++ b933063.cpp -l mysqlclient && ./a.out | tee result + if grep --quiet latin result; then echo "ERROR: Charset latin found!"; exit 1; fi + echo "Testing -l mariadbclient" + g++ b933063.cpp -l mariadbclient && ./a.out | tee result + if grep --quiet latin result; then echo "ERROR: Charset latin found!"; exit 1; fi .test-install-all-libs: &test-install-all-libs - apt-get install -y ./libmariadb3_*.deb ./libmariadb-dev_*.deb ./libmariadb-dev-compat_*.deb ./libmariadbd19_*.deb ./libmariadbd-dev_*.deb ./mariadb-common_*.deb @@ -163,7 +213,7 @@ fresh install: script: - *test-prepare-container - *test-install - - service mariadb status # There is no init.d/mysql in MariaDB 10.5 + - service mariadb status # There is no init.d/mysql in MariaDB 10.6 - *test-verify-final variables: GIT_STRATEGY: none @@ -171,8 +221,8 @@ fresh install: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mariadb-10.5 Bullseye upgrade: - stage: upgrade in Bullseye +mariadb-10.6 Sid upgrade: + stage: upgrade in Sid needs: - job: build image: debian:${RELEASE} @@ -184,7 +234,7 @@ mariadb-10.5 Bullseye upgrade: script: - *test-prepare-container - *test-install - - service mariadb status # There is no init.d/mysql in MariaDB 10.5 + - service mariadb status # There is no init.d/mysql in MariaDB 10.6 - *test-verify-final variables: GIT_STRATEGY: none @@ -192,11 +242,11 @@ mariadb-10.5 Bullseye upgrade: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mariadb-10.3 Buster to mariadb-10.5 upgrade: - stage: upgrade from Buster/Stretch +mariadb-10.5 Bullseye to mariadb-10.6 upgrade: + stage: upgrade from Bullseye/Buster needs: - job: build - image: debian:buster + image: debian:bullseye artifacts: when: always name: "$CI_BUILD_NAME" @@ -204,13 +254,13 @@ mariadb-10.3 Buster to mariadb-10.5 upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - # Install everything MariaDB currently in Debian Buster + # Install everything MariaDB currently in Debian Bullseye - apt-get install -y 'default-mysql*' 'mariadb-*' 'libmariadb*' - # Verify installation of MariaDB from Buster + # Verify installation of MariaDB from Bullseye - *test-verify-initial - - *test-enable-bullseye-repos + - *test-enable-sid-repos - *test-install - - service mysql status + - service mariadb status - *test-verify-final variables: GIT_STRATEGY: none @@ -218,11 +268,11 @@ mariadb-10.3 Buster to mariadb-10.5 upgrade: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mariadb-10.1 Stretch to mariadb-10.5 upgrade: - stage: upgrade from Buster/Stretch +mariadb-10.3 Buster to mariadb-10.6 upgrade: + stage: upgrade from Bullseye/Buster needs: - job: build - image: debian:stretch + image: debian:buster artifacts: when: always name: "$CI_BUILD_NAME" @@ -230,12 +280,11 @@ mariadb-10.1 Stretch to mariadb-10.5 upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - # Install almost everything currently in Debian Stretch, - # omitting libmariadbclient-dev-compat as it would conflict - - apt-get install -y 'default-mysql*' 'mariadb-*' 'libmariadbd*' 'libmariadbclient*' - # Verify installation of MariaDB from Stretch + # Install everything MariaDB currently in Debian Buster + - apt-get install -y 'default-mysql*' 'mariadb-*' 'libmariadb*' + # Verify installation of MariaDB from Buster - *test-verify-initial - - *test-enable-bullseye-repos + - *test-enable-sid-repos - *test-install - service mysql status - *test-verify-final @@ -258,7 +307,7 @@ test basic features: script: - *test-prepare-container - *test-install - - service mariadb status # There is no init.d/mysql in MariaDB 10.5 + - service mariadb status # There is no init.d/mysql in MariaDB 10.6 - *test-verify-final - | # Print info about server @@ -349,8 +398,8 @@ build mariadbclient consumer Python-MySQLdb: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -default-libmysqlclient-dev Bullseye upgrade: - stage: upgrade in Bullseye +libmysql* to libmariadb* upgrade: + stage: upgrade in Sid needs: - job: build image: debian:${RELEASE} @@ -361,19 +410,32 @@ default-libmysqlclient-dev Bullseye upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - - apt-get install -y pkg-config default-libmysqlclient-dev default-libmysqld-dev + # Install all libmysql* available in Debian unstable + - apt-get install -y pkg-config libmysqlclient-dev - pkg-config --list-all - - *test-install-all-libs + - pkg-config --cflags mysqlclient # mysqlclient.pc from original package + - apt-get install -y ./libmariadb3_*.deb ./mariadb-common_*.deb + - pkg-config --list-all + - apt-get install -y ./libmariadb-dev_*.deb + - pkg-config --list-all + - apt-get install -y ./libmariadb-dev-compat_*.deb + - pkg-config --cflags mysqlclient # mysqlclient.pc from compat package + - pkg-config --list-all + - apt-get install -y ./libmariadbd19_*.deb + - pkg-config --list-all + - apt-get install -y ./libmariadbd-dev_*.deb + - pkg-config --list-all + - apt-get install -y default-libmysqlclient-dev default-libmysqld-dev - *test-verify-libs except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -default-libmysqlclient-dev Buster upgrade: - stage: upgrade from Buster/Stretch +default-libmysqlclient-dev Sid upgrade: + stage: upgrade in Sid needs: - job: build - image: debian:buster + image: debian:${RELEASE} artifacts: when: always name: "$CI_BUILD_NAME" @@ -381,20 +443,19 @@ default-libmysqlclient-dev Buster upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - - apt-get install -y pkg-config default-libmysqlclient-dev + - apt-get install -y pkg-config default-libmysqlclient-dev default-libmysqld-dev - pkg-config --list-all - - *test-enable-bullseye-repos - *test-install-all-libs - *test-verify-libs except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -default-libmysqlclient-dev Stretch upgrade: - stage: upgrade from Buster/Stretch +default-libmysqlclient-dev Bullseye upgrade: + stage: upgrade from Bullseye/Buster needs: - job: build - image: debian:stretch + image: debian:bullseye artifacts: when: always name: "$CI_BUILD_NAME" @@ -404,18 +465,18 @@ default-libmysqlclient-dev Stretch upgrade: - *test-prepare-container - apt-get install -y pkg-config default-libmysqlclient-dev - pkg-config --list-all - - *test-enable-bullseye-repos + - *test-enable-sid-repos - *test-install-all-libs - *test-verify-libs except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mariadb-connector-c Stretch upgrade: - stage: upgrade from Buster/Stretch +default-libmysqlclient-dev Buster upgrade: + stage: upgrade from Bullseye/Buster needs: - job: build - image: debian:stretch + image: debian:buster artifacts: when: always name: "$CI_BUILD_NAME" @@ -423,9 +484,9 @@ mariadb-connector-c Stretch upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - - apt-get install -y pkg-config libmariadb2 libmariadb-dev libmariadb-dev-compat + - apt-get install -y pkg-config default-libmysqlclient-dev - pkg-config --list-all - - *test-enable-bullseye-repos + - *test-enable-sid-repos - *test-install-all-libs - *test-verify-libs except: @@ -434,7 +495,34 @@ mariadb-connector-c Stretch upgrade: # Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump. # The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh. -mysql-8.0 Focal to mariadb-10.5 upgrade: +mysql-8.0 Sid to mariadb-10.6 upgrade: + stage: upgrade in Sid + needs: + - job: build + image: debian:sid + artifacts: + when: always + name: "$CI_BUILD_NAME" + paths: + - ${WORKING_DIR}/debug + script: + - *test-prepare-container + # The postinst fails often if 'ps' is missing from system, so install procps + - apt-get install -y procps mysql-server 'libmysqlc*' + - *test-verify-initial + - *test-install + - service mysql status + - sleep 5 # Give the mysql_upgrade a bit of time to complete before querying the server + - *test-verify-final + variables: + GIT_STRATEGY: none + except: + variables: + - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ + +# Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump. +# The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh. +mysql-8.0 Focal to mariadb-10.6 upgrade: stage: upgrade extras needs: - job: build buster-backports @@ -467,11 +555,11 @@ mysql-8.0 Focal to mariadb-10.5 upgrade: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mysql-5.7 Bionic to mariadb-10.5 upgrade: +mariadb.org-10.6 to mariadb-10.6 upgrade: stage: upgrade extras needs: - - job: build stretch-backports - image: debian:stretch + - job: build + image: debian:${RELEASE} artifacts: when: always name: "$CI_BUILD_NAME" @@ -479,33 +567,35 @@ mysql-5.7 Bionic to mariadb-10.5 upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - # Add Ubuntu Bionic archive keys and repository - - apt-get install --no-install-recommends --yes gpg gpg-agent dirmngr ca-certificates # Bare minimal (<4MB) for apt-key to work - - apt-key adv --recv-keys --keyserver hkps://keyserver.ubuntu.com:443 871920D1991BC93C 3B4FE6ACC0B21F32 - - echo "deb http://archive.ubuntu.com/ubuntu/ bionic main restricted" > /etc/apt/sources.list.d/ubuntu.list + - apt install -y curl + - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc + - echo "deb https://deb.mariadb.org/10.6/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list - apt-get update - - apt-get install -y 'mysql*' 'libmysqlc*' + # Package libmariadbclient-dev from mariadb.org conflicts with libmariadb-dev in Sid, so cannot use wildcard that would include it + # Enable this line when there is a way to install them only from the mariadb.org repo + # - apt-get install -y 'mariadb*' libmariadb3 'libmariadb-*' 'libmariadbd*' + - apt-get install -y mariadb-server-10.6 - *test-verify-initial - # Enable backports to make libzstd1, rocksdb-tools - - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list - # Enable backports to make galera-4 available - - echo "deb http://deb.debian.org/debian stretch-backports-sloppy main" >> /etc/apt/sources.list.d/backports.list && apt-get update - # Remove plugin that requires libcurl4, not available in Debian Stretch - - rm mariadb-plugin-s3*.deb - - *test-install - - service mysql status - - sleep 5 # Give the mysql_upgrade a bit of time to complete before querying the server + # Install MariaDB built in this commit + # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.5.5-1 vs 1:10.5.5+mariadb~sid + - apt-get install -y --allow-downgrades ./*.deb + # Verify installation of MariaDB built in this commit + - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed + - mariadb --version # Client version + - service mariadb status # There is no init.d/mysql in MariaDB 10.6 - *test-verify-final variables: GIT_STRATEGY: none except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ + allow_failure: true + # Installation on Sid fails on missing liburing1 because upstream 10.6 + # MariaDB.org buildbot has not run 'apt upgrade' for a long time. + # Remove this allow_failure once buildbot has built a new 10.6 + # release using latest liburing-dev in Debian Sid. -# As Bullseye already has MariaDB 10.5, upstream does not provide any <10.5 -# packages for Bullseye and thus no upgrades on lower versions can be tested -# inside Bullseye -mariadb.org-10.5 to mariadb-10.5 upgrade: +mariadb.org-10.5 to mariadb-10.6 upgrade: stage: upgrade extras needs: - job: build @@ -521,17 +611,9 @@ mariadb.org-10.5 to mariadb-10.5 upgrade: - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc - echo "deb https://deb.mariadb.org/10.5/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list - apt-get update - # The 10.5.9 release is missing mariadb-plugin-columnstore, define all other packages but it to avoid hitting the error: - # The following packages have unmet dependencies: - # mariadb-plugin-columnstore : Depends: mariadb-server-10.5 (= 1:10.5.8+maria~sid) but 1:10.5.9+maria~sid is to be installed - - apt-get install -y libmariadb3 'libmariadb-*' 'libmariadbd*' 'mariadb-c*' 'mariadb-b*' 'mariadb-s*' 'mariadb-t*' 'mariadb-plugin-con*' 'mariadb-plugin-cr*' 'mariadb-plugin-g*' 'mariadb-plugin-m*' 'mariadb-plugin-o*' 'mariadb-plugin-s*' - # Once 10.5.10 is out, revert back to: - # Package libmariadbclient-dev from mariadb.org conflicts with libmariadb-dev in Bullseye, so cannot use wildcard that would include it - #- apt-get install -y 'mariadb*' libmariadb3 'libmariadb-*' 'libmariadbd*' + - apt-get install -y mariadb-server-10.5 - *test-verify-initial # Install MariaDB built in this commit - # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.5.5-1 vs 1:10.5.5+mariadb~sid - - apt-get install -y --allow-downgrades ./*.deb # Verify installation of MariaDB built in this commit - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed - mariadb --version # Client version @@ -539,15 +621,14 @@ mariadb.org-10.5 to mariadb-10.5 upgrade: - *test-verify-final variables: GIT_STRATEGY: none - RELEASE: bullseye # Last Debian release that MariaDB.org published 10.5 binaries for except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mariadb.org-10.4 to mariadb-10.5 upgrade: +mariadb.org-10.4 to mariadb-10.6 upgrade: stage: upgrade extras needs: - - job: build buster-backports + - job: build image: debian:${RELEASE} artifacts: when: always @@ -556,10 +637,11 @@ mariadb.org-10.4 to mariadb-10.5 upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - - apt install -y curl + - apt install -y curl systemctl # systemctl shim needed on platforms that don't have systemd - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc - echo "deb https://deb.mariadb.org/10.4/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list - apt-get update + - *test-install-readline-in-sid-for-backwards-compat - apt-get install -y 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 @@ -572,15 +654,14 @@ mariadb.org-10.4 to mariadb-10.5 upgrade: - *test-verify-final variables: GIT_STRATEGY: none - RELEASE: buster # Last Debian release that MariaDB.org published 10.4 binaries for except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mariadb.org-10.3 to mariadb-10.5 upgrade: +mariadb.org-10.3 to mariadb-10.6 upgrade: stage: upgrade extras needs: - - job: build buster-backports + - job: build image: debian:${RELEASE} artifacts: when: always @@ -593,10 +674,9 @@ mariadb.org-10.3 to mariadb-10.5 upgrade: - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc - echo "deb https://deb.mariadb.org/10.3/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list - apt-get update + - *test-install-readline-in-sid-for-backwards-compat - apt-get install -y mariadb-server-10.3 - *test-verify-initial - # Enable backports to make galera-4 available - - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list.d/backports.list && apt-get update - *test-install - service mysql status # Give the mariadb-upgrade plenty of time to complete, otherwise next commands @@ -605,15 +685,14 @@ mariadb.org-10.3 to mariadb-10.5 upgrade: - *test-verify-final variables: GIT_STRATEGY: none - RELEASE: buster # Last Debian release that MariaDB.org published 10.3 binaries for except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mariadb.org-10.2 to mariadb-10.5 upgrade: +mariadb.org-10.2 to mariadb-10.6 upgrade: stage: upgrade extras needs: - - job: build stretch-backports + - job: build image: debian:${RELEASE} artifacts: when: always @@ -622,10 +701,11 @@ mariadb.org-10.2 to mariadb-10.5 upgrade: - ${WORKING_DIR}/debug script: - *test-prepare-container - - apt install -y curl apt-transport-https + - apt install -y curl - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc - echo "deb https://deb.mariadb.org/10.2/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list - apt-get update + - *test-install-readline-in-sid-for-backwards-compat - apt-get install -y mariadb-server-10.2 # Verify initial state before upgrade - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed @@ -636,19 +716,6 @@ mariadb.org-10.2 to mariadb-10.5 upgrade: mysql --defaults-file=/etc/mysql/debian.cnf --table -e "SHOW DATABASES;" mysql --defaults-file=/etc/mysql/debian.cnf --table -e "SELECT * FROM mysql.user; SHOW CREATE USER root@localhost;" mysql --defaults-file=/etc/mysql/debian.cnf --table -e "SELECT * FROM mysql.plugin; SHOW PLUGINS;" - # Enable backports to make libzstd1, rocksdb-tools - - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list - # Enable backports to make galera-4 available - - echo "deb http://deb.debian.org/debian stretch-backports-sloppy main" >> /etc/apt/sources.list.d/backports.list && apt-get update - # Increase default backports priority policy from '100' to '500' so it can actually be used - - | - cat << EOF > /etc/apt/preferences.d/enable-backports-to-satisfy-dependencies - Package: * - Pin: release n=stretch-* - Pin-Priority: 500 - EOF - # Remove plugin that requires libcurl4, not available in Debian Stretch - - rm mariadb-plugin-s3*.deb - *test-install - service mysql status # Give the mariadb-upgrade plenty of time to complete, otherwise next commands @@ -657,12 +724,11 @@ mariadb.org-10.2 to mariadb-10.5 upgrade: - *test-verify-final variables: GIT_STRATEGY: none - RELEASE: stretch # Last Debian release that MariaDB.org published 10.2 binaries for except: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -mysql.com-5.7 to mariadb-10.5 upgrade: +mysql.com-5.7 to mariadb-10.6 upgrade: stage: upgrade extras needs: - job: build buster-backports @@ -693,7 +759,7 @@ mysql.com-5.7 to mariadb-10.5 upgrade: variables: - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ -percona-xtradb-5.7 to mariadb-10.5 upgrade (MDEV-22679): +percona-xtradb-5.7 to mariadb-10.6 upgrade (MDEV-22679): stage: upgrade extras needs: - job: build buster-backports diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 2fab3096024..c570453b5be 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,13 +1,13 @@ # Necessary for drop-in-place-replacement upgrades on mysql-server/-client # since package breaks/replaces these but at the same time also provides them -version-substvar-for-external-package mariadb-client-core-10.5 -> mysql-client-5.* -version-substvar-for-external-package mariadb-server-10.5 -> mysql-server +version-substvar-for-external-package mariadb-client-core-10.6 -> mysql-client-5.5 +version-substvar-for-external-package mariadb-server-10.6 -> mysql-server version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev version-substvar-for-external-package libmariadb-dev -> libmysqld-dev -version-substvar-for-external-package mariadb-server-10.5 -> mysql-client-5.* -version-substvar-for-external-package mariadb-server-10.5 -> mysql-client-8.* -version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5.* -version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-8.* +version-substvar-for-external-package mariadb-server-10.6 -> mysql-client-5.* +version-substvar-for-external-package mariadb-server-10.6 -> mysql-client-8.* +version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-5.* +version-substvar-for-external-package mariadb-client-10.6 -> mysql-client-core-8.* version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2 diff --git a/debian/tests/control b/debian/tests/control index 16e091cfa6b..68067071c6b 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -3,7 +3,7 @@ Tests: smoke # 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-10.5 +Depends: mariadb-plugin-rocksdb | mariadb-server-10.6 Restrictions: allow-stderr needs-root isolation-container Tests: upstream diff --git a/debian/tests/smoke b/debian/tests/smoke index 4e06feae20c..e5d50496bdb 100644 --- a/debian/tests/smoke +++ b/debian/tests/smoke @@ -4,7 +4,7 @@ # # This test should be declared in debian/tests/control with a dependency # on the package that provides a configured MariaDB server (eg. -# mariadb-server-10.5). +# mariadb-server-10.6). # # This test should be declared in debian/tests/control with the # following restrictions: @@ -88,7 +88,7 @@ if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] && LOG=/var/lib/mysql/#rocksdb/LOG # XXX: The server may only be started during the install of - # mariadb-server-10.5, which happens before that of the plugin. + # mariadb-server-10.6, which happens before that of the plugin. [ -e $LOG ] || mysql -e "INSTALL PLUGIN RocksDB SONAME 'ha_rocksdb';" # XXX: rocksdb_supported_compression_types variable does not report ZSTD. diff --git a/debian/tests/upstream b/debian/tests/upstream index d4f31dabef4..f216df24371 100644 --- a/debian/tests/upstream +++ b/debian/tests/upstream @@ -22,8 +22,7 @@ echo "using tmpdir: $WORKDIR/tmp" echo "Setting up skip-tests-list" -# Use unstable-tests list as base to skip all tests considered unstable -cp /usr/share/mysql/mysql-test/unstable-tests $SKIP_TEST_LST +touch $SKIP_TEST_LST # Also use arch specific skiplists if such files exist for filename in /usr/share/mysql/mysql-test/unstable-tests.* |