Skip to content

Commit

Permalink
Fix mariadb CI broken by upstream (#1443)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
samuel40791765 authored Feb 20, 2024
1 parent 7f76c04 commit aec9db1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/ci/integration/run_mariadb_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}
Expand Down

0 comments on commit aec9db1

Please sign in to comment.