mirror of
https://github.com/MariaDB/server.git
synced 2025-07-23 00:55:06 +00:00
Create a 10.10 branch
This commit is contained in:
2
VERSION
2
VERSION
@ -1,4 +1,4 @@
|
||||
MYSQL_VERSION_MAJOR=10
|
||||
MYSQL_VERSION_MINOR=9
|
||||
MYSQL_VERSION_MINOR=10
|
||||
MYSQL_VERSION_PATCH=0
|
||||
SERVER_MATURITY=alpha
|
||||
|
@ -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.9 servers.
|
||||
# This group is only read by MariaDB-10.10 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.9]
|
||||
[mariadb-10.10]
|
||||
|
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
||||
mariadb (1:10.9.0) unstable; urgency=medium
|
||||
mariadb (1:10.10.0) unstable; urgency=medium
|
||||
|
||||
* Initial Release
|
||||
|
||||
|
8
debian/control
vendored
8
debian/control
vendored
@ -386,7 +386,7 @@ Replaces: mariadb-client (<< ${source:Version}),
|
||||
percona-xtradb-cluster-server-5.7,
|
||||
virtual-mysql-client-core
|
||||
Provides: default-mysql-client-core,
|
||||
mariadb-client-core-10.9,
|
||||
mariadb-client-core-10.10,
|
||||
virtual-mysql-client-core
|
||||
Description: MariaDB database core client binaries
|
||||
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
|
||||
@ -553,7 +553,7 @@ Replaces: mariadb-client (<< ${source:Version}),
|
||||
percona-xtradb-cluster-server-5.7,
|
||||
virtual-mysql-client
|
||||
Provides: default-mysql-client,
|
||||
mariadb-client-10.9,
|
||||
mariadb-client-10.10,
|
||||
virtual-mysql-client
|
||||
Recommends: libdbd-mariadb-perl | libdbd-mysql-perl,
|
||||
libdbi-perl,
|
||||
@ -671,7 +671,7 @@ Replaces: mariadb-client (<< ${source:Version}),
|
||||
percona-xtradb-cluster-server-5.7,
|
||||
virtual-mysql-server-core
|
||||
Provides: default-mysql-server-core,
|
||||
mariadb-server-core-10.9,
|
||||
mariadb-server-core-10.10,
|
||||
virtual-mysql-server-core
|
||||
Description: MariaDB database core server files
|
||||
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
|
||||
@ -787,7 +787,7 @@ Replaces: handlersocket-mysql-5.5,
|
||||
percona-xtradb-cluster-server-5.7,
|
||||
virtual-mysql-server
|
||||
Provides: default-mysql-server,
|
||||
mariadb-server-10.9,
|
||||
mariadb-server-10.10,
|
||||
virtual-mysql-server
|
||||
Description: MariaDB database server binaries
|
||||
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
|
||||
|
8
debian/salsa-ci.yml
vendored
8
debian/salsa-ci.yml
vendored
@ -494,7 +494,7 @@ mysql-8.0 Jammy to mariadb upgrade:
|
||||
variables:
|
||||
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
|
||||
|
||||
mariadb.org-10.7 to mariadb-10.9 upgrade:
|
||||
mariadb.org-10.7 to mariadb-10.10 upgrade:
|
||||
stage: upgrade extras
|
||||
needs:
|
||||
- job: build
|
||||
@ -569,12 +569,12 @@ mariadb.org-10.6 to mariadb-10.8 upgrade:
|
||||
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.9
|
||||
# Installation on Sid fails on missing liburing1 because upstream 10.10
|
||||
# MariaDB.org buildbot has not run 'apt upgrade' for a long time.
|
||||
# Remove this allow_failure once buildbot has built a new 10.9
|
||||
# Remove this allow_failure once buildbot has built a new 10.10
|
||||
# release using latest liburing-dev in Debian Sid.
|
||||
|
||||
mariadb.org-10.5 to mariadb-10.9 upgrade:
|
||||
mariadb.org-10.5 to mariadb-10.10 upgrade:
|
||||
stage: upgrade extras
|
||||
needs:
|
||||
- job: build
|
||||
|
28
debian/source/lintian-overrides
vendored
28
debian/source/lintian-overrides
vendored
@ -15,22 +15,22 @@ version-substvar-for-external-package mariadb-client -> mysql-client-core-5.7
|
||||
version-substvar-for-external-package mariadb-client -> mysql-client-core-8.0
|
||||
version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
|
||||
# Intentional version-substvar-for-external-package as long as mariadb-server
|
||||
# provides mariadb-server-10.9 and mariadb-client provides mariadb-client-10.9
|
||||
version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.9
|
||||
version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.9
|
||||
version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.9
|
||||
# provides mariadb-server-10.10 and mariadb-client provides mariadb-client-10.10
|
||||
version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.10
|
||||
version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.10
|
||||
version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.10
|
||||
version-substvar-for-external-package Conflicts (line 95) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
|
||||
version-substvar-for-external-package Replaces (line 109) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
|
||||
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.9
|
||||
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.9
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.9
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.9
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.9
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.9
|
||||
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.9
|
||||
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.9
|
||||
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.9
|
||||
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.9
|
||||
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.10
|
||||
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.10
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.10
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.10
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.10
|
||||
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.10
|
||||
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.10
|
||||
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.10
|
||||
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.10
|
||||
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.10
|
||||
# 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
|
||||
# Must be fixed upstream
|
||||
|
Reference in New Issue
Block a user