diff options
Diffstat (limited to 'libmysql/CMakeLists.txt')
| -rw-r--r-- | libmysql/CMakeLists.txt | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 9996b167323..1ddb0f7db98 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -141,13 +141,14 @@ mysql_load_plugin mysql_load_plugin_v mysql_plugin_options # Async API +mysql_get_timeout_value +mysql_get_timeout_value_ms +mysql_get_socket mysql_autocommit_cont mysql_autocommit_start mysql_change_user_cont mysql_change_user_start mysql_close_cont -mysql_close_slow_part_cont -mysql_close_slow_part_start mysql_close_start mysql_commit_cont mysql_commit_start @@ -262,17 +263,26 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") IF(RPM) # Fedora & Co declared following functions as part of API - # These functions are alias of another function (given mysql_ prefix=. The - # renaming is handled in rpm_support.cc below SET(CLIENT_API_EXTRA mysql_default_charset_info mysql_get_charset mysql_get_charset_by_csname mysql_net_realloc mysql_client_errors - ) + + # Also export the non-renamed variants + # (in case someone wants to rebuild mysqli-php or something similar) + # See MDEV-4127 + default_charset_info + get_charset + get_charset_by_csname + net_realloc + client_errors + THR_KEY_mysys + ) + # Add special script to fix symbols renames by Fedora - SET(CLIENT_SOURCES_EXTRA ${CLIENT_SOURCES} rpm_support.cc) + SET(CLIENT_SOURCES_EXTRA rpm_support.cc) SET(VERSION_SCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_rpm_version.in) ELSEIF(DEB) @@ -361,7 +371,7 @@ IF(UNIX) ENDIF() IF(NOT DISABLE_SHARED) - MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) |