From aec9db1308e62fce187c5435c3dc71032d066b62 Mon Sep 17 00:00:00 2001 From: Samuel Chiang Date: Tue, 20 Feb 2024 09:57:07 -0800 Subject: [PATCH] Fix mariadb CI broken by upstream (#1443) Upstream MariaDB's tip of main broke our integration CI with MariaDB/server@2bc940f. I pinned this down to us not building in the functionality during the MariaDB compilation step. This reenables the functionality to get around the broken CI. --- tests/ci/integration/run_mariadb_integration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ci/integration/run_mariadb_integration.sh b/tests/ci/integration/run_mariadb_integration.sh index 357aa1e2c1..5b40614d86 100755 --- a/tests/ci/integration/run_mariadb_integration.sh +++ b/tests/ci/integration/run_mariadb_integration.sh @@ -34,7 +34,7 @@ rm -rf "${SCRATCH_FOLDER:?}"/* cd ${SCRATCH_FOLDER} function mariadb_build() { - cmake ${MARIADB_SRC_FOLDER} -GNinja -DWITH_SSL=${AWS_LC_INSTALL_FOLDER} "-B${MARIADB_BUILD_FOLDER}" -DPLUGIN_COLUMNSTORE=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_S3=NO -DPLUGIN_MROONGA=NO -DPLUGIN_CONNECT=NO -DPLUGIN_SPHINX=NO -DPLUGIN_SPIDER=NO -DPLUGIN_TOKUDB=NO -DPLUGIN_PERFSCHEMA=NO -DWITH_WSREP=OFF + cmake ${MARIADB_SRC_FOLDER} -GNinja -DWITH_SSL=${AWS_LC_INSTALL_FOLDER} "-B${MARIADB_BUILD_FOLDER}" -DPLUGIN_COLUMNSTORE=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_S3=NO -DPLUGIN_MROONGA=NO -DPLUGIN_CONNECT=NO -DPLUGIN_SPHINX=NO -DPLUGIN_SPIDER=NO -DPLUGIN_TOKUDB=NO -DWITH_WSREP=OFF ninja -C ${MARIADB_BUILD_FOLDER} ls -R ${MARIADB_BUILD_FOLDER} }