diff options
| author | Lawrin Novitsky <lawrin.novitsky@mariadb.com> | 2022-09-12 14:39:12 +0200 |
|---|---|---|
| committer | Lawrin Novitsky <lawrin.novitsky@mariadb.com> | 2022-10-25 14:00:21 +0200 |
| commit | 1ff476b415cacc616f68af542b75793d064367ae (patch) | |
| tree | 999c1d04ee2b6141c7b740763a2bbb9a2077a265 /cmake | |
| parent | 32158be720b85a3ae0e0eeebe1277c36f86dca38 (diff) | |
| download | mariadb-git-1ff476b415cacc616f68af542b75793d064367ae.tar.gz | |
MDEV-29490 Renaming internally used client API to avoid name conflicts
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.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/abi_check.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake index 805322229c4..1d897e5a3a7 100644 --- a/cmake/abi_check.cmake +++ b/cmake/abi_check.cmake @@ -38,7 +38,6 @@ IF(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang" AND RUN_ABI_CHECK) SET(API_PREPROCESSOR_HEADER ${CMAKE_SOURCE_DIR}/include/mysql/plugin_audit.h ${CMAKE_SOURCE_DIR}/include/mysql/plugin_ftparser.h - ${CMAKE_SOURCE_DIR}/include/mysql.h ${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v1.h ${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v2.h ${CMAKE_SOURCE_DIR}/include/mysql/client_plugin.h |