diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
| commit | 92c8d6f168f329bf7e3998a4f580781d0239b59a (patch) | |
| tree | 1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /cmake | |
| parent | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff) | |
| parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
| download | mariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz | |
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 7814f1dbeac..fba0bd03dac 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -266,7 +266,7 @@ SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL "Directory of debug FUNCTION(INSTALL_MYSQL_TEST from to) IF(INSTALL_MYSQLTESTDIR) IF(NOT WITH_WSREP) - SET(EXCL_GALERA "(suite/(galera|wsrep|sys_vars/[rt]/(sysvars_)?wsrep).*|include/((w.*)?wsrep.*|.*galera.*)\\.inc|std_data/(galera|wsrep).*)") + SET(EXCL_GALERA "(suite/(galera|wsrep|sys_vars/[rt]/(sysvars_)?wsrep).*|std_data/(galera|wsrep).*)") ELSE() SET(EXCL_GALERA "^DOES_NOT_EXIST$") ENDIF() |