Merge branch '10.0' into 10.1

This commit is contained in:
Vicențiu Ciorbaru 2017-09-19 12:06:50 +03:00
commit ec6042bda0
193 changed files with 43237 additions and 3008 deletions

View file

@ -222,7 +222,8 @@ MACRO(MYSQL_ADD_PLUGIN)
# Install dynamic library
IF(ARG_COMPONENT)
IF(CPACK_COMPONENTS_ALL AND
NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT})
NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT}
AND INSTALL_SYSCONF2DIR)
IF (ARG_STORAGE_ENGINE)
SET(ver " = %{version}-%{release}")
ELSE()