summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.11 into 11.0Marko Mäkelä2023-02-161-2/+2
|\
| * Merge branch '10.10' into 10.11Oleksandr Byelkin2023-01-311-2/+2
| |\
| | * Merge branch '10.8' into 10.9Oleksandr Byelkin2023-01-311-2/+2
| | |\
| | | * Merge branch '10.7' into 10.8Oleksandr Byelkin2023-01-311-2/+2
| | | |\
| | | | * Merge branch '10.6' into 10.7Oleksandr Byelkin2023-01-311-2/+2
| | | | |\
| | | | | * Merge branch '10.5' into 10.6Oleksandr Byelkin2023-01-311-2/+2
| | | | | |\
| | | | | | * Merge branch '10.4' into 10.5Oleksandr Byelkin2023-01-271-2/+2
| | | | | | |\
| | | | | | | * Merge branch '10.3' into 10.4Oleksandr Byelkin2023-01-261-1/+1
| | | | | | | |\
| | | | | | | | * MDEV-30457 Windows, signtool error "No file digest algorithm specified."Vladislav Vaintroub2023-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /fd parameter. It is now mandatory for the recent versions of signtool
* | | | | | | | | Merge 11.0-selectivity into 11.0Sergei Petrunia2023-02-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change BUILD scripts to use wolfss by defaultMonty2023-02-031-1/+1
| |/ / / / / / / /
* | | | | | | | | MDEV-30203 Move mysql symlinks to different packageDaniel Black2023-02-124-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For both Deb and RPM, create mariadb-client-compat and mariadb-server-compat containing the mysql links to the mariadb named executables/scripts. The mariadb-client-core mysqlcheck was moved to mariadb-client-compat. The symlinks in MYSQL_ADD_EXECUTABLE is tagged as a {Client,Server}Symlinks component and placed in the symlinks packages. Man pages are restructured be installed into compat package if that matches the executable. Columnstore has a workaround as it doesn't use the cmake/plugin.cmake. Scripts likewise have compatibility symlinks are in the {server,client}-compat packages. Co-author: Andrew Hutchings <andrew@linuxjedi.co.uk> Closes #2390
* | | | | | | | | resolve-stack-dump was moved from server to client (RPM)Daniel Black2023-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like where the man page and Debian package put it.
* | | | | | | | | more changes to man page handlingSergei Golubchik2023-02-122-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move them from ManPagesX component to X (works better for plugins), but keep ManPagesDevelopment as C/C is using it * move backup manpages to Backup * move plugin manpages (s3, rocksdb) to plugins
* | | | | | | | | cmake: rename backup component to BackupSergei Golubchik2023-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for consistency
* | | | | | | | | cmake: simplify handling of man pagesSergei Golubchik2023-02-121-42/+18
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | and remove unused function INSTALL_MANPAGE
* | | | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-01-241-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Marko Mäkelä2023-01-241-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-241-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7Marko Mäkelä2023-01-241-0/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | rpm: ignore man3Daniel Black2023-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During testing of RPM packages in MDEV-30203: file /usr/share/man/man3 from install of MariaDB-devel-11.0.1-1.el7_9.x86_64 conflicts with file from package filesystem-3.2-25.el7.x86_64 MariaDB is the first libmariadb to include man3 man pages so make the changes here like what is done for man1 and man8.
* | | | | | | | Merge branch '10.10' into 10.11Oleksandr Byelkin2023-01-181-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2023-01-181-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2023-01-181-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2023-01-181-2/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2023-01-181-2/+2
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | new PCRE2 10.42Oleksandr Byelkin2023-01-181-2/+2
| | | | | | | |
* | | | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-01-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Marko Mäkelä2023-01-101-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-101-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | | Merge 10.6 into 10.7Marko Mäkelä2023-01-101-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2023-01-101-1/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | MDEV-30344 MTR tests fail when built without WSREPRobin Newhouse2023-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with -DWITH_WSREP=OFF, files required for MTR tests are excluded and several tests fail. This is cause by a recent commit 7b44d0ba which attempted to resolve MDEV-23230. Even when building without WSREP/Galera support some of the MTR include files named *wsrep* are required by other tests. Removing the following from the CMake install macros will avoid excluding the MTR test .inc files: `|include/((w.*)?wsrep.*|.*galera.*)\\.inc` All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.
* | | | | | | | Merge 10.10 into 10.11Marko Mäkelä2022-11-302-1/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Marko Mäkelä2022-11-302-1/+10
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-302-1/+10
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-11-302-1/+10
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-11-302-1/+10
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | MDEV-23230 wsrep files installed when built without WSREP (#2334)Daniel Black2022-11-282-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent wsrep files from being installed if WITH_WSREP=OFF. Reviewed by Daniel Black Additionally excluded #include wsrep files and galera* files along with galera/wsrep tests. mysql-test/include/have_wsrep.inc remainds as its used by a few isolated tests. Co-authored-by: Chris Ross <cross2@cisco.com>
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-11-021-1/+0
| | | |\ \ \ \ \ | | | | |/ / / /
* | | | | | | | Merge branch '10.10' into 10.11Oleksandr Byelkin2022-11-031-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2022-11-021-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2022-11-021-1/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '10.6' into 10.7Oleksandr Byelkin2022-11-021-1/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | | |/ / / /
| | | | * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-11-021-1/+0
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2022-10-261-1/+0
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-10-261-1/+0
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-29490 Renaming internally used client API to avoid name conflictsLawrin Novitsky2022-10-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with C/C. The patch introduces mariadb_capi_rename.h which is included into mysql.h. The hew header contains macro definitions for the names being renamed. In versions 10.6+(i.e. where sql service exists) the renaming condition in the mariadb_capi_rename.h should be added with && !defined(MYSQL_DYNAMIC_PLUGIN) and look like The patch also contains removal of mysql.h from the api check. Disabling false_duper-6543 test for embedded. ha_federated.so uses C API. C API functions are being renamed in the server, but not renamed in embedded, since embedded server library should have proper C API, as expected by programs using it. Thus the same ha_federated.so cannot work both for server and embedded server library. As all federated tests are already disabled for embedded, federated isn't supposed to work for embedded anyway, and thus the test is being disabled.
* | | | | | | | MDEV-22659: Create one logrotate config - Deb/Rpm fixDaniel Black2022-10-271-1/+1
| | | | | | | |
* | | | | | | | Merge 10.10 into 10.11Marko Mäkelä2022-10-131-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /