VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-17 21:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-09-30 11:01:07 +03:00
parent 8dd4794c4e a49e394399
commit b36d6f92a8
80 changed files with 1876 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysqld/CMakeLists.txt
View File

@ -145,6 +145,9 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
DTRACE_INSTRUMENT(sql_embedded)
ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)
IF(TARGET pcre2)
ADD_DEPENDENCIES(sql_embedded pcre2)
ENDIF()
# On Windows, static embedded server library is called mysqlserver.lib
# On Unix, it is libmysqld.a