From 9ddeccc299112864d98ced1b0415c086b7d98a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 5 Apr 2020 18:55:15 +0300 Subject: [PATCH 1/4] Travis-CI: Add missing build dependency dh-exec Backported from 30b44aaec7120f41ee1383536730947cfa427308. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8f21dc4d337..c2edb30e9c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,7 @@ matrix: - cmake - debhelper - dh-apparmor + - dh-exec - dpatch - gdb - libaio-dev From 8d056affd86dcfa0546b4eb2ce133812871b2bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 5 Apr 2020 23:55:23 +0300 Subject: [PATCH 2/4] Travis-CI: Shorten deb build log to keep it under 4 MB There is a 4 MB hard limit on Travis-CI and build output needs to be less than that. Silencing the 'make install' step gets rid of a lot of "Installing.." and "Missing.." and removing all mysql-test files will make the dh_missing warnings much shorter. Cherry-picked from 41952c85f1644690249ce624de7609cbebb93638. --- debian/rules | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 647c73e43e0..809911d4179 100755 --- a/debian/rules +++ b/debian/rules @@ -121,8 +121,13 @@ endif cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.2.mariadb@.service - # make install - cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) + # Run 'make install' without output since it is uninteresting and + # silencing it helps to make overall build log shorter and more readable + @echo "Running $(MAKE) install DESTDIR=$(TMP) ..." + cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) > /dev/null + + # If mariadb-test package is removed, also remove most of it's files + grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mysql/mysql-test # Delete runnable files we don't want to have in the test data package. # This avoids triggering multiple Lintian errors. From c995090a537b79b4ab92e7cae0f74560325965d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 17 May 2020 15:52:35 +0300 Subject: [PATCH 3/4] Travis-CI: Remove builds that always fail to make CI useful again Also clean away dead code that is not used and will never have any use on the 10.2 branch. --- .travis.yml | 70 +++-------------------------------------------------- 1 file changed, 4 insertions(+), 66 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2edb30e9c1..d38ba46b971 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,8 @@ git: depth: 2 language: cpp -os: - - linux - - osx -osx_image: xcode9.1 +os: linux + compiler: - gcc - clang @@ -19,15 +17,9 @@ compiler: cache: apt: true ccache: true - directories: - - /usr/local/Cellar env: matrix: -# - GCC_VERSION=4.8 TYPE=Debug MYSQL_TEST_SUITES=rpl -# - GCC_VERSION=5 TYPE=Debug MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts -# - GCC_VERSION=6 TYPE=Debug MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb -# - GCC_VERSION=6 TYPE=Debug MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,percona,perfschema,plugins,multi_source,roles - GCC_VERSION=4.8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl - GCC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts - GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb @@ -35,8 +27,8 @@ env: matrix: exclude: - - os: osx - compiler: gcc + - compiler: clang + env: GCC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts include: - os: linux compiler: gcc @@ -87,51 +79,6 @@ matrix: - export MTR_MEM=/tmp - env DEB_BUILD_OPTIONS="parallel=6" debian/autobake-deb.sh; - ccache --show-stats - # Until OSX becomes a bit more stable: MDEV-12435 - allow_failures: - - os: osx - compiler: clang - env: GCC_VERSION=4.8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl - - os: osx - compiler: clang - env: GCC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts - - os: osx - compiler: clang - env: GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb - - os: osx - compiler: clang - env: GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,percona,perfschema,plugins,multi_source,roles - -# Matrix include for coverity -# - env: -# - GCC_VERSION=6 -# addon: -# coverity_scan: -# # ref: https://scan.coverity.com/travis_ci -# # GitHub project metadata -# project: -# - name: MariaDB/server -# - description: MariaDB Server -# -# # Where email notification of build analysis results will be sent -# notification_email: security@mariadb.org -# -# # Commands to prepare for build_command -# build_command_prepend: -# - source .travis.compiler.sh -# - ${MYSQL_BUILD_CC} --version ; ${MYSQL_BUILD_CXX} --version -# - cmake . -# -DCMAKE_BUILD_TYPE=Debug -# -DWITH_SSL=system -DWITH_ZLIB=system -# -DWITHOUT_TOKUDB_STORAGE_ENGINE=ON -DWITHOUT_MROONGA_STORAGE_ENGINE=ON -# -# # The command that will be added as an argument to "cov-build" to compile your project for analysis, -# build_command: make -j 4 -# -# # Pattern to match selecting branches that will run analysis. -# # Take care in resource usage, and consider the build frequency allowances per -# # https://scan.coverity.com/faq#frequency - 7 per week is the current limit. -# branch_pattern: .*coverity.* addons: apt: @@ -178,15 +125,6 @@ addons: - libzmq-dev - uuid-dev -# libsystemd-daemon-dev # https://github.com/travis-ci/apt-package-whitelist/issues/3882 - -before_install: - - if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then - brew update; - brew install gnutls lz4 lzo xz snappy ccache jemalloc curl ossp-uuid pcre; - brew link ccache; - fi - script: - ccache --version # Clang: From 7baa40dffae4c8175913ab58d320684f1d5f1bad Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 18 May 2020 16:37:51 +1000 Subject: [PATCH 4/4] MDEV-21976: mtr main.udf - broaden localhost (#1543) Localhost, depending on the platform can return any 127.0.0.1/8 address. --- mysql-test/r/udf.result | 6 +++--- mysql-test/t/udf.test | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index bcfc9941db9..c74b89a1b96 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -30,9 +30,9 @@ lookup("127.0.0.1") 127.0.0.1 select lookup(127,0,0,1); ERROR HY000: Can't initialize function 'lookup'; Wrong arguments to lookup; Use the source -select lookup("localhost"); -lookup("localhost") -127.0.0.1 +select lookup("localhost") rlike '^127\.\\d+\.\\d+.\\d+$'; +lookup("localhost") rlike '^127\.\\d+\.\\d+.\\d+$' +1 select reverse_lookup(); ERROR HY000: Can't initialize function 'reverse_lookup'; Wrong number of arguments to reverse_lookup; Use the source select reverse_lookup("127.0.0.1"); diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test index 4ee412f80d8..e9ba8e941e3 100644 --- a/mysql-test/t/udf.test +++ b/mysql-test/t/udf.test @@ -47,7 +47,7 @@ select lookup(); select lookup("127.0.0.1"); --error ER_CANT_INITIALIZE_UDF select lookup(127,0,0,1); -select lookup("localhost"); +select lookup("localhost") rlike '^127\.\\d+\.\\d+.\\d+$'; --error ER_CANT_INITIALIZE_UDF select reverse_lookup();