Skip to content

Commit 6268bda

Browse files
dr-mdr-m
committed
Merge 10.5 into 10.6
2 parents 3f38e2a + 1bf9acc commit 6268bda

File tree

16 files changed

+575
-519
lines changed

16 files changed

+575
-519
lines changed

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ compiler:
114114
- clang
115115
env:
116116
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
117-
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb,versioning,rpl
118-
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
117+
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,rocksdb,versioning,rpl
118+
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles,encryption
119119
- CC_VERSION=10 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
120120

121121
jobs:
@@ -191,10 +191,10 @@ jobs:
191191
arch: s390x
192192
compiler: gcc
193193
env: CC_VERSION=10 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
194-
# Sporadically fails on main.multi_update_big test (MDEV-23955)
195-
- arch: arm64
196194
# Until OSX becomes a bit more stable
197195
- os: osx
196+
# ppc64el builder frequently runs out of memory
197+
- arch: ppc64le
198198

199199
before_install:
200200
- if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then

‎debian/autobake-deb.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ if [[ -d storage/columnstore/columnstore/debian ]]; then
2222
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
2323
echo >> debian/control
2424
cat storage/columnstore/columnstore/debian/control >> debian/control
25+
# ColumnStore is explcitly disabled in the native build, so allow it now
26+
# when build it when triggered by autobake-deb.sh
27+
sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules
2528
fi
2629

2730
# General CI optimizations to keep build output smaller
@@ -33,7 +36,7 @@ then
3336

3437
# MCOL-4149: ColumnStore builds are so slow and big that they must be skipped on
3538
# both Travis-CI and Gitlab-CI
36-
sed 's|-DPLUGIN_COLUMNSTORE=YES|-DPLUGIN_COLUMNSTORE=NO|' -i debian/rules
39+
sed 's|$(CMAKEFLAGS)|$(CMAKEFLAGS) -DPLUGIN_COLUMNSTORE=NO|' -i debian/rules
3740
sed "/Package: mariadb-plugin-columnstore/,/^$/d" -i debian/control
3841
fi
3942

‎debian/control

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,16 @@ Conflicts: mariadb-client-10.0,
285285
mysql-client-core-5.7,
286286
mysql-client-core-8.0,
287287
virtual-mysql-client-core
288-
Replaces: mariadb-client-core-5.1,
289-
mariadb-client-core-5.2,
290-
mariadb-client-core-5.3,
291-
mariadb-client-core-5.5,
292-
mariadb-client-core-10.0,
288+
Replaces: mariadb-client-core-10.0,
293289
mariadb-client-core-10.1,
294290
mariadb-client-core-10.2,
295291
mariadb-client-core-10.3,
296292
mariadb-client-core-10.4,
297293
mariadb-client-core-10.5,
294+
mariadb-client-core-5.1,
295+
mariadb-client-core-5.2,
296+
mariadb-client-core-5.3,
297+
mariadb-client-core-5.5,
298298
mysql-client-core-5.1,
299299
mysql-client-core-5.5,
300300
mysql-client-core-5.6,
@@ -346,16 +346,16 @@ Conflicts: mariadb-client (<< ${source:Version}),
346346
mysql-client-core-8.0,
347347
mytop,
348348
virtual-mysql-client
349-
Replaces: mariadb-client-5.1,
350-
mariadb-client-5.2,
351-
mariadb-client-5.3,
352-
mariadb-client-5.5,
353-
mariadb-client-10.0,
349+
Replaces: mariadb-client-10.0,
354350
mariadb-client-10.1,
355351
mariadb-client-10.2,
356352
mariadb-client-10.3,
357353
mariadb-client-10.4,
358354
mariadb-client-10.5,
355+
mariadb-client-5.1,
356+
mariadb-client-5.2,
357+
mariadb-client-5.3,
358+
mariadb-client-5.5,
359359
mysql-client-5.0,
360360
mysql-client-5.1,
361361
mysql-client-5.5,
@@ -400,16 +400,16 @@ Conflicts: mariadb-server-core-10.0,
400400
mysql-server-core-5.7,
401401
mysql-server-core-8.0,
402402
virtual-mysql-server-core
403-
Replaces: mariadb-server-core-5.1,
404-
mariadb-server-core-5.2,
405-
mariadb-server-core-5.3,
406-
mariadb-server-core-5.5,
407-
mariadb-server-core-10.0,
403+
Replaces: mariadb-server-core-10.0,
408404
mariadb-server-core-10.1,
409405
mariadb-server-core-10.2,
410406
mariadb-server-core-10.3,
411407
mariadb-server-core-10.4,
412408
mariadb-server-core-10.5,
409+
mariadb-server-core-5.1,
410+
mariadb-server-core-5.2,
411+
mariadb-server-core-5.3,
412+
mariadb-server-core-5.5,
413413
mysql-server-core-5.0,
414414
mysql-server-core-5.1,
415415
mysql-server-core-5.5,
@@ -476,16 +476,16 @@ Conflicts: mariadb-server (<< ${source:Version}),
476476
mysql-server-5.7,
477477
mysql-server-8.0,
478478
virtual-mysql-server
479-
Replaces: mariadb-server-5.1,
480-
mariadb-server-5.2,
481-
mariadb-server-5.3,
482-
mariadb-server-5.5,
483-
mariadb-server-10.0,
479+
Replaces: mariadb-server-10.0,
484480
mariadb-server-10.1,
485481
mariadb-server-10.2,
486482
mariadb-server-10.3,
487483
mariadb-server-10.4,
488484
mariadb-server-10.5,
485+
mariadb-server-5.1,
486+
mariadb-server-5.2,
487+
mariadb-server-5.3,
488+
mariadb-server-5.5,
489489
mysql-server-4.1,
490490
mysql-server-5.0,
491491
mysql-server-5.1,
@@ -718,18 +718,18 @@ Depends: mariadb-client-10.6 (= ${binary:Version}),
718718
${misc:Depends},
719719
${perl:Depends},
720720
${shlibs:Depends}
721-
Breaks: mariadb-test-5.5,
722-
mariadb-test-10.0,
721+
Breaks: mariadb-test-10.0,
723722
mariadb-test-10.1,
724723
mariadb-test-10.2,
725724
mariadb-test-10.3,
726725
mariadb-test-10.4,
727-
Replaces: mariadb-test-5.5,
728-
mariadb-test-10.0,
726+
mariadb-test-5.5
727+
Replaces: mariadb-test-10.0,
729728
mariadb-test-10.1,
730729
mariadb-test-10.2,
731730
mariadb-test-10.3,
732731
mariadb-test-10.4,
732+
mariadb-test-5.5,
733733
virtual-mysql-testsuite
734734
Provides: virtual-mysql-testsuite
735735
Suggests: patch
@@ -747,23 +747,23 @@ Multi-Arch: foreign
747747
Depends: ${misc:Depends},
748748
${perl:Depends},
749749
${shlibs:Depends}
750-
Breaks: mariadb-test-data-5.5,
751-
mariadb-test-data-10.0,
750+
Breaks: mariadb-test-data-10.0,
752751
mariadb-test-data-10.1,
753752
mariadb-test-data-10.2,
754753
mariadb-test-data-10.3,
755754
mariadb-test-data-10.4,
755+
mariadb-test-data-5.5,
756756
mysql-testsuite,
757757
mysql-testsuite-5.5,
758758
mysql-testsuite-5.6,
759759
mysql-testsuite-5.7,
760760
mysql-testsuite-8.0
761-
Replaces: mariadb-test-data-5.5,
762-
mariadb-test-data-10.0,
761+
Replaces: mariadb-test-data-10.0,
763762
mariadb-test-data-10.1,
764763
mariadb-test-data-10.2,
765764
mariadb-test-data-10.3,
766765
mariadb-test-data-10.4,
766+
mariadb-test-data-5.5,
767767
mysql-testsuite,
768768
mysql-testsuite-5.5,
769769
mysql-testsuite-5.6,

‎debian/mariadb-server-10.6.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ debian/additions/debian-start.inc.sh usr/share/mysql
33
debian/additions/echo_stderr usr/share/mysql
44
debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
55
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
6-
support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
76
debian/additions/source_mariadb-10.6.py usr/share/apport/package-hooks
87
etc/apparmor.d/usr.sbin.mariadbd
98
etc/security/user_map.conf
109
lib/*/security/pam_user_map.so
1110
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
1211
lib/systemd/system/mysql.service
1312
lib/systemd/system/mysqld.service
13+
support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
1414
usr/bin/aria_chk
1515
usr/bin/aria_dump_log
1616
usr/bin/aria_ftdump

‎debian/mariadb-test.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ usr/lib/*/libmariadb3/plugin/qa_auth_interface.so
88
usr/lib/mysql/plugin/adt_null.so
99
usr/lib/mysql/plugin/auth_0x0100.so
1010
usr/lib/mysql/plugin/auth_test_plugin.so
11-
usr/lib/mysql/plugin/test_sql_service.so
1211
usr/lib/mysql/plugin/daemon_example.ini
1312
usr/lib/mysql/plugin/debug_key_management.so
1413
usr/lib/mysql/plugin/dialog_examples.so
@@ -20,6 +19,7 @@ usr/lib/mysql/plugin/libdaemon_example.so
2019
usr/lib/mysql/plugin/mypluglib.so
2120
usr/lib/mysql/plugin/qa_auth_interface.so
2221
usr/lib/mysql/plugin/qa_auth_server.so
22+
usr/lib/mysql/plugin/test_sql_service.so
2323
usr/lib/mysql/plugin/test_versioning.so
2424
usr/share/man/man1/mariadb-client-test-embedded.1
2525
usr/share/man/man1/mariadb-client-test.1

‎debian/rules

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ ifeq (32,$(DEB_HOST_ARCH_BITS))
4848
CMAKEFLAGS += -DPLUGIN_ROCKSDB=NO
4949
endif
5050

51-
# ColumnStore only attempts to build on a few platforms as dictated by CMake checks
52-
# Also note in debian/control the CS-only build deps marked '[amd64]'
53-
ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64))
54-
CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES
55-
endif
56-
5751
# Add extra flag to avoid WolfSSL code crashing the entire mariadbd on s390x. This
5852
# can be removed once upstream has made the code s390x compatible, see
5953
# https://jira.mariadb.org/browse/MDEV-21705 and
@@ -85,6 +79,8 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
8579
dh_auto_build --builddirectory=builddir-native -- import_executables
8680
endif
8781

82+
# Don't build ColumnStore as part of the native build, only build it when
83+
# triggered by autobake-deb.sh. Saves build time and disk space.
8884
mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \
8985
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
9086
CC=${CC} \
@@ -97,6 +93,7 @@ endif
9793
-DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \
9894
-DBUILD_CONFIG=mysql_release \
9995
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \
96+
-DPLUGIN_COLUMNSTORE=NO \
10097
-DDEB=$(DEB_VENDOR) ..'
10198

10299
# This is needed, otherwise 'make test' will run before binaries have been built

0 commit comments

Comments
 (0)