diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-11 01:44:07 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-01-11 01:45:09 +0100 |
commit | dc42b3c4d9546153e2f0049393e3771e21551679 (patch) | |
tree | 1231d23f45e253a49cd6fa21745c6ea40d82a56b /sql/CMakeLists.txt | |
parent | 2450fd67ed403bb8a154925dd1ca500b23f5b3cc (diff) | |
download | mariadb-git-dc42b3c4d9546153e2f0049393e3771e21551679.tar.gz |
Backport MDEV-17504 to 5.5
mysql_install_db.exe should not remove datadir, if it was not created by
it.
Diffstat (limited to 'sql/CMakeLists.txt')
-rw-r--r-- | sql/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 02196a7e366..6648b7a2612 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -351,7 +351,7 @@ IF(WIN32) ${CMAKE_CURRENT_BINARY_DIR}/mysql_bootstrap_sql.c COMPONENT Server ) - TARGET_LINK_LIBRARIES(mysql_install_db mysys) + TARGET_LINK_LIBRARIES(mysql_install_db mysys shlwapi) ADD_LIBRARY(winservice STATIC winservice.c) TARGET_LINK_LIBRARIES(winservice shell32) |