5.5 merge

This commit is contained in:
Sergei Golubchik 2013-01-29 15:10:47 +01:00
commit 0af4b6c6ee
372 changed files with 11030 additions and 2959 deletions

View file

@ -149,8 +149,21 @@ IF(UNIX)
${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
ENDIF()
# List of exported functions in embedded (client api except client plugin or
# async (*_start/*_cont functions)
SET(EMBEDDED_API)
FOREACH(f ${CLIENT_API_FUNCTIONS})
IF(f MATCHES "plugin|_start$|_cont$")
# Ignore functions, embedded does not export them
ELSE()
SET(EMBEDDED_API ${EMBEDDED_API} ${f})
ENDIF()
ENDFOREACH()
IF(NOT DISABLE_SHARED)
MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}
MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API}
COMPONENT Server)
IF(UNIX)
# Name the shared library, handle versioning (provides same api as client