Skip to content

M
MariaDB
Commit 6ca07c21 authored by Daniel Black's avatar Daniel Black
Browse files
Options

Merge 10.5 into 10.6

parents 831adb1e 0df74a01
Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 27 deletions
debian/control
View file @ 6ca07c21
...@@ -288,7 +288,17 @@ Conflicts: mariadb-client-10.0, ...@@ -288,7 +288,17 @@ Conflicts: mariadb-client-10.0,
mysql-client-core-5.7, mysql-client-core-5.7,
mysql-client-core-8.0, mysql-client-core-8.0,
virtual-mysql-client-core virtual-mysql-client-core
Replaces: mariadb-client-core-10.0, 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-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
mariadb-client-5.5,
mariadb-client-core-10.0,
mariadb-client-core-10.1, mariadb-client-core-10.1,
mariadb-client-core-10.2, mariadb-client-core-10.2,
mariadb-client-core-10.3, mariadb-client-core-10.3,
...@@ -298,6 +308,10 @@ Replaces: mariadb-client-core-10.0, ...@@ -298,6 +308,10 @@ Replaces: mariadb-client-core-10.0,
mariadb-client-core-5.2, mariadb-client-core-5.2,
mariadb-client-core-5.3, mariadb-client-core-5.3,
mariadb-client-core-5.5, mariadb-client-core-5.5,
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
mysql-client-5.5,
mysql-client-core-5.1, mysql-client-core-5.1,
mysql-client-core-5.5, mysql-client-core-5.5,
mysql-client-core-5.6, mysql-client-core-5.6,
...@@ -349,7 +363,14 @@ Conflicts: mariadb-client (<< ${source:Version}), ...@@ -349,7 +363,14 @@ Conflicts: mariadb-client (<< ${source:Version}),
mysql-client-core-8.0, mysql-client-core-8.0,
mytop, mytop,
virtual-mysql-client virtual-mysql-client
Replaces: mariadb-client-10.0, Breaks: mariadb-client-core-10.0,
mariadb-client-core-10.1,
mariadb-client-core-10.2,
mariadb-client-core-10.3,
mariadb-client-core-10.4,
mariadb-client-core-10.5 (<< ${source:Version})
Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.0,
mariadb-client-10.1, mariadb-client-10.1,
mariadb-client-10.2, mariadb-client-10.2,
mariadb-client-10.3, mariadb-client-10.3,
...@@ -359,12 +380,26 @@ Replaces: mariadb-client-10.0, ...@@ -359,12 +380,26 @@ Replaces: mariadb-client-10.0,
mariadb-client-5.2, mariadb-client-5.2,
mariadb-client-5.3, mariadb-client-5.3,
mariadb-client-5.5, mariadb-client-5.5,
mariadb-client-core-10.0,
mariadb-client-core-10.1,
mariadb-client-core-10.2,
mariadb-client-core-10.3,
mariadb-client-core-10.4,
mariadb-client-core-10.5 (<< ${source:Version}),
mariadb-server-10.5 (<< ${source:Version}),
mysql-client (<< 5.0.51),
mysql-client-5.0, mysql-client-5.0,
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5, mysql-client-5.5,
mysql-client-5.6, mysql-client-5.6,
mysql-client-5.7, mysql-client-5.7,
mysql-client-8.0, mysql-client-8.0,
mysql-client-core-5.0,
mysql-client-core-5.1,
mysql-client-core-5.5,
mysql-client-core-5.6,
mysql-client-core-5.7,
mysql-client-core-8.0,
mytop, mytop,
virtual-mysql-client virtual-mysql-client
Provides: default-mysql-client, Provides: default-mysql-client,
...@@ -403,7 +438,28 @@ Conflicts: mariadb-server-core-10.0, ...@@ -403,7 +438,28 @@ Conflicts: mariadb-server-core-10.0,
mysql-server-core-5.7, mysql-server-core-5.7,
mysql-server-core-8.0, mysql-server-core-8.0,
virtual-mysql-server-core virtual-mysql-server-core
Replaces: mariadb-server-core-10.0, Breaks: mariadb-client-10.0,
mariadb-client-10.1,
mariadb-client-10.2,
mariadb-client-10.3,
mariadb-client-10.4,
mariadb-client-10.5 (<< ${source:Version}),
mariadb-server-10.3,
mariadb-server-10.4,
mariadb-server-10.5 (<< ${source:Version}),
mysql-server-5.6,
mysql-server-5.7,
mysql-server-8.0
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-server-10.3,
mariadb-server-10.4,
mariadb-server-10.5 (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1, mariadb-server-core-10.1,
mariadb-server-core-10.2, mariadb-server-core-10.2,
mariadb-server-core-10.3, mariadb-server-core-10.3,
...@@ -413,6 +469,10 @@ Replaces: mariadb-server-core-10.0, ...@@ -413,6 +469,10 @@ Replaces: mariadb-server-core-10.0,
mariadb-server-core-5.2, mariadb-server-core-5.2,
mariadb-server-core-5.3, mariadb-server-core-5.3,
mariadb-server-core-5.5, mariadb-server-core-5.5,
mysql-server-5.0,
mysql-server-5.6,
mysql-server-5.7,
mysql-server-8.0,
mysql-server-core-5.0, mysql-server-core-5.0,
mysql-server-core-5.1, mysql-server-core-5.1,
mysql-server-core-5.5, mysql-server-core-5.5,
...@@ -470,6 +530,7 @@ Conflicts: mariadb-server (<< ${source:Version}), ...@@ -470,6 +530,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
mysql-client-5.6, mysql-client-5.6,
mysql-client-5.7, mysql-client-5.7,
mysql-client-8.0, mysql-client-8.0,
mysql-client-core-8.0,
mysql-server, mysql-server,
mysql-server-4.1, mysql-server-4.1,
mysql-server-5.0, mysql-server-5.0,
...@@ -478,8 +539,16 @@ Conflicts: mariadb-server (<< ${source:Version}), ...@@ -478,8 +539,16 @@ Conflicts: mariadb-server (<< ${source:Version}),
mysql-server-5.6, mysql-server-5.6,
mysql-server-5.7, mysql-server-5.7,
mysql-server-8.0, mysql-server-8.0,
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
mysql-server-core-8.0,
virtual-mysql-server virtual-mysql-server
Replaces: mariadb-server-10.0, Replaces: libmariadbclient-dev (<< 5.5.0),
libmariadbclient16,
mariadb-client-10.5 (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1, mariadb-server-10.1,
mariadb-server-10.2, mariadb-server-10.2,
mariadb-server-10.3, mariadb-server-10.3,
...@@ -489,6 +558,12 @@ Replaces: mariadb-server-10.0, ...@@ -489,6 +558,12 @@ Replaces: mariadb-server-10.0,
mariadb-server-5.2, mariadb-server-5.2,
mariadb-server-5.3, mariadb-server-5.3,
mariadb-server-5.5, mariadb-server-5.5,
mysql-client-5.5,
mysql-client-5.6,
mysql-client-5.7,
mysql-client-8.0,
mysql-client-core-8.0,
mysql-server,
mysql-server-4.1, mysql-server-4.1,
mysql-server-5.0, mysql-server-5.0,
mysql-server-5.1, mysql-server-5.1,
...@@ -722,18 +797,34 @@ Depends: mariadb-client-10.6 (= ${binary:Version}), ...@@ -722,18 +797,34 @@ Depends: mariadb-client-10.6 (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${perl:Depends}, ${perl:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-test-10.0, Conflicts: mariadb-server-5.5,
mysql-server-5.7,
mysql-server-core-8.0
Breaks: mariadb-server-5.5,
mariadb-test-10.0,
mariadb-test-10.1, mariadb-test-10.1,
mariadb-test-10.2, mariadb-test-10.2,
mariadb-test-10.3, mariadb-test-10.3,
mariadb-test-10.4, mariadb-test-10.4,
mariadb-test-5.5 mariadb-test-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
Replaces: mariadb-test-10.0, Replaces: mariadb-test-10.0,
mariadb-test-10.1, mariadb-test-10.1,
mariadb-test-10.2, mariadb-test-10.2,
mariadb-test-10.3, mariadb-test-10.3,
mariadb-test-10.4, mariadb-test-10.4,
mariadb-test-5.5, mariadb-test-5.5,
mysql-testsuite,
mysql-testsuite-5.5,
mysql-testsuite-5.6,
mysql-testsuite-5.7,
mysql-testsuite-8.0,
virtual-mysql-testsuite virtual-mysql-testsuite
Provides: virtual-mysql-testsuite Provides: virtual-mysql-testsuite
Suggests: patch Suggests: patch
...@@ -751,23 +842,21 @@ Multi-Arch: foreign ...@@ -751,23 +842,21 @@ Multi-Arch: foreign
Depends: ${misc:Depends}, Depends: ${misc:Depends},
${perl:Depends}, ${perl:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-test-data-10.0, Breaks: mariadb-test-10.0,
mariadb-test-data-10.1, mariadb-test-10.1,
mariadb-test-data-10.2, mariadb-test-10.2,
mariadb-test-data-10.3, mariadb-test-5.5,
mariadb-test-data-10.4, mariadb-test-data-10.0,
mariadb-test-data-5.5,
mysql-testsuite, mysql-testsuite,
mysql-testsuite-5.5, mysql-testsuite-5.5,
mysql-testsuite-5.6, mysql-testsuite-5.6,
mysql-testsuite-5.7, mysql-testsuite-5.7,
mysql-testsuite-8.0 mysql-testsuite-8.0
Replaces: mariadb-test-data-10.0, Replaces: mariadb-test-10.0,
mariadb-test-data-10.1, mariadb-test-10.1,
mariadb-test-data-10.2, mariadb-test-10.2,
mariadb-test-data-10.3, mariadb-test-5.5,
mariadb-test-data-10.4, mariadb-test-data-10.0,
mariadb-test-data-5.5,
mysql-testsuite, mysql-testsuite,
mysql-testsuite-5.5, mysql-testsuite-5.5,
mysql-testsuite-5.6, mysql-testsuite-5.6,
......
debian/salsa-ci.yml
View file @ 6ca07c21
...@@ -116,11 +116,6 @@ build native deb: ...@@ -116,11 +116,6 @@ build native deb:
ccache -s ccache -s
mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR} mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR}
# Temporarily ignore until https://github.com/MariaDB/server/pull/1729 is merged
missing-breaks:
extends: .test-missing-breaks
allow_failure: true
piuparts: piuparts:
extends: .test-piuparts extends: .test-piuparts
stage: test extras stage: test extras
...@@ -539,9 +534,8 @@ mysql-8.0 Sid to mariadb-10.6 upgrade: ...@@ -539,9 +534,8 @@ mysql-8.0 Sid to mariadb-10.6 upgrade:
- ${WORKING_DIR}/debug - ${WORKING_DIR}/debug
script: script:
- *test-prepare-container - *test-prepare-container
# First install often fail due to bug in mysql-8.0 # The postinst fails often if 'ps' is missing from system, so install procps
- apt-get install -y mysql-server 'libmysqlc*' || true - apt-get install -y procps mysql-server 'libmysqlc*'
- sleep 10 && apt-get install -f
- *test-verify-initial - *test-verify-initial
- *test-install - *test-install
- service mysql status - service mysql status
...@@ -609,8 +603,13 @@ mariadb.org-10.5 to mariadb-10.6 upgrade: ...@@ -609,8 +603,13 @@ mariadb.org-10.5 to mariadb-10.6 upgrade:
- echo 'deb http://mirror.one.com/mariadb/repo/10.5/debian sid main' > /etc/apt/sources.list.d/mariadb.list - echo 'deb http://mirror.one.com/mariadb/repo/10.5/debian sid main' > /etc/apt/sources.list.d/mariadb.list
- apt-get update - apt-get update
- *test-install-readline-in-sid-for-backwards-compat - *test-install-readline-in-sid-for-backwards-compat
# The 10.5.9 relase 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 conficts with libmariadb-dev in Sid, so cannot use wildcard that would include it # Package libmariadbclient-dev from mariadb.org conficts with libmariadb-dev in Sid, so cannot use wildcard that would include it
- apt-get install -y 'mariadb*' libmariadb3 'libmariadb-*' 'libmariadbd*' #- apt-get install -y 'mariadb*' libmariadb3 'libmariadb-*' 'libmariadbd*'
- *test-verify-initial - *test-verify-initial
# Install MariaDB built in this commit # 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 # 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7