database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

improve build, allow sql library to be built in parallel with builtins

Browse Source
This commit is contained in:
Vladislav Vaintroub
2019-06-28 13:21:39 +02:00
committed by Sergei Krivonos
parent b17576322b
commit 1a3570dec3
4 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extra/mariabackup/CMakeLists.txt
View File

@ -75,6 +75,7 @@ MYSQL_ADD_EXECUTABLE(mariabackup
backup_mysql.cc
backup_copy.cc
encryption_plugin.cc
${PROJECT_BINARY_DIR}/sql/sql_builtin.cc
${PROJECT_SOURCE_DIR}/sql/net_serv.cc
${NT_SERVICE_SOURCE}
${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c
@ -82,13 +83,14 @@ MYSQL_ADD_EXECUTABLE(mariabackup
)
# Export all symbols on Unix, for better crash callstacks
SET_TARGET_PROPERTIES(mariabackup PROPERTIES ENABLE_EXPORTS TRUE)
ADD_SUBDIRECTORY(crc)
TARGET_LINK_LIBRARIES(mariabackup sql crc)
TARGET_LINK_LIBRARIES(mariabackup sql sql_builtins crc)
IF(NOT HAVE_SYSTEM_REGEX)
TARGET_LINK_LIBRARIES(mariabackup pcreposix)
ENDIF()

17
sql/CMakeLists.txt
View File

@ -145,11 +145,11 @@ SET (SQL_SOURCE
${WSREP_SOURCES}
table_cache.cc encryption.cc temporary_tables.cc
proxy_protocol.cc backup.cc xa.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc
${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
${CMAKE_CURRENT_BINARY_DIR}/lex_token.h
${GEN_SOURCES}
${MYSYS_LIBWRAP_SOURCE}
)
@ -177,13 +177,20 @@ RECOMPILE_FOR_EMBEDDED)
ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
DTRACE_INSTRUMENT(sql)
TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
TARGET_LINK_LIBRARIES(sql
mysys mysys_ssl dbug strings vio pcre
${LIBWRAP} ${LIBCRYPT} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
${WSREP_LIB}
${SSL_LIBRARIES}
${LIBSYSTEMD})
FOREACH(se aria partition perfschema sql_sequence)
# These engines are used directly in sql sources.
IF(TARGET ${se})
TARGET_LINK_LIBRARIES(sql ${se})
ENDIF()
ENDFOREACH()
IF(WIN32)
SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
TARGET_LINK_LIBRARIES(sql psapi)
@ -267,6 +274,9 @@ IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
SET_TARGET_PROPERTIES(mysqld_import_lib PROPERTIES IMPORTED_LOCATION ${MYSQLD_LIB})
ENDIF()
ADD_LIBRARY( sql_builtins ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc)
TARGET_LINK_LIBRARIES(sql_builtins ${MYSQLD_STATIC_PLUGIN_LIBS})
MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server)
IF(APPLE)
@ -294,7 +304,8 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
ENDIF()
ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS)
TARGET_LINK_LIBRARIES(mysqld LINK_PRIVATE sql)
TARGET_LINK_LIBRARIES(mysqld LINK_PRIVATE sql sql_builtins)
# Provide plugins with minimal set of libraries
SET(INTERFACE_LIBS ${LIBRT})

8
unittest/sql/CMakeLists.txt
View File

@ -21,10 +21,12 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/extra/yassl/include)
IF(WIN32)
ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc
../../sql/nt_servc.cc)
ADD_EXECUTABLE(explain_filename-t
explain_filename-t.cc
dummy_builtins.cc
../../sql/nt_servc.cc)
ELSE()
ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc)
ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc dummy_builtins.cc)
ENDIF()
TARGET_LINK_LIBRARIES(explain_filename-t sql mytap)

26
unittest/sql/dummy_builtins.cc Normal file
View File

@ -0,0 +1,26 @@
/* 2018 MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <mysql/plugin.h>
struct st_maria_plugin *mysql_optional_plugins[]=
{
0
};
struct st_maria_plugin *mysql_mandatory_plugins[]=
{
0
};