Skip to content

Commit dbaeeb6

Browse files
spetruniaspetrunia
committed
Create a 10.11 branch
1 parent 88b2235 commit dbaeeb6

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=10
2-
MYSQL_VERSION_MINOR=10
2+
MYSQL_VERSION_MINOR=11
33
MYSQL_VERSION_PATCH=0
44
SERVER_MATURITY=alpha

‎debian/additions/mariadb.conf.d/50-server.cnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ collation-server = utf8mb4_general_ci
108108
# you can put MariaDB-only options here
109109
[mariadb]
110110

111-
# This group is only read by MariaDB-10.10 servers.
111+
# This group is only read by MariaDB-10.11 servers.
112112
# If you use the same .cnf file for MariaDB of different versions,
113113
# use this group for options that older servers don't understand
114-
[mariadb-10.10]
114+
[mariadb-10.11]

‎debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mariadb (1:10.10.0) unstable; urgency=medium
1+
mariadb (1:10.11.0) unstable; urgency=medium
22

33
* Initial Release
44

‎debian/control

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ Replaces: mariadb-client (<< ${source:Version}),
384384
percona-xtradb-cluster-server-5.7,
385385
virtual-mysql-client-core
386386
Provides: default-mysql-client-core,
387-
mariadb-client-core-10.10,
387+
mariadb-client-core-10.11,
388388
virtual-mysql-client-core
389389
Description: MariaDB database core client binaries
390390
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -544,7 +544,7 @@ Replaces: mariadb-client (<< ${source:Version}),
544544
percona-xtradb-cluster-server-5.7,
545545
virtual-mysql-client
546546
Provides: default-mysql-client,
547-
mariadb-client-10.10,
547+
mariadb-client-10.11,
548548
virtual-mysql-client
549549
Recommends: libdbd-mariadb-perl | libdbd-mysql-perl,
550550
libdbi-perl,
@@ -658,7 +658,7 @@ Replaces: mariadb-client (<< ${source:Version}),
658658
percona-xtradb-cluster-server-5.7,
659659
virtual-mysql-server-core
660660
Provides: default-mysql-server-core,
661-
mariadb-server-core-10.10,
661+
mariadb-server-core-10.11,
662662
virtual-mysql-server-core
663663
Description: MariaDB database core server files
664664
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -771,7 +771,7 @@ Replaces: handlersocket-mysql-5.5,
771771
percona-xtradb-cluster-server-5.7,
772772
virtual-mysql-server
773773
Provides: default-mysql-server,
774-
mariadb-server-10.10,
774+
mariadb-server-10.11,
775775
virtual-mysql-server
776776
Description: MariaDB database server binaries
777777
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database

‎debian/salsa-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ mysql-8.0 Jammy to mariadb upgrade:
494494
variables:
495495
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
496496

497-
mariadb.org-10.7 to mariadb-10.10 upgrade:
497+
mariadb.org-10.7 to mariadb-10.11 upgrade:
498498
stage: upgrade extras
499499
needs:
500500
- job: build
@@ -569,12 +569,12 @@ mariadb.org-10.6 to mariadb-10.8 upgrade:
569569
variables:
570570
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
571571
allow_failure: true
572-
# Installation on Sid fails on missing liburing1 because upstream 10.10
572+
# Installation on Sid fails on missing liburing1 because upstream 10.11
573573
# MariaDB.org buildbot has not run 'apt upgrade' for a long time.
574-
# Remove this allow_failure once buildbot has built a new 10.10
574+
# Remove this allow_failure once buildbot has built a new 10.11
575575
# release using latest liburing-dev in Debian Sid.
576576

577-
mariadb.org-10.5 to mariadb-10.10 upgrade:
577+
mariadb.org-10.5 to mariadb-10.11 upgrade:
578578
stage: upgrade extras
579579
needs:
580580
- job: build

‎debian/source/lintian-overrides

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-5
1010
version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-8.*
1111
version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
1212
# Intentional version-substvar-for-external-package as long as mariadb-server
13-
# provides mariadb-server-10.10 and mariadb-client provides mariadb-client-10.10
14-
version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.10
15-
version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.10
16-
version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.10
13+
# provides mariadb-server-10.11 and mariadb-client provides mariadb-client-10.11
14+
version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.11
15+
version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.11
16+
version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.11
1717
version-substvar-for-external-package Conflicts (line 95) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
1818
version-substvar-for-external-package Replaces (line 109) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
19-
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.10
20-
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.10
21-
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.10
22-
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.10
23-
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.10
24-
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.10
25-
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.10
26-
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.10
27-
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.10
28-
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.10
19+
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.11
20+
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.11
21+
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.11
22+
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.11
23+
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.11
24+
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.11
25+
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.11
26+
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.11
27+
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.11
28+
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.11
2929
# ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
3030
source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
3131
# Must be fixed upstream

0 commit comments

Comments
 (0)