summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-11-13 13:10:32 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2018-11-15 18:03:30 +0100
commita93ac8d95fd504412bd819325bfaa816e317786c (patch)
treec1f79a3fa8c68661df72a3a92c626ca808ba38d9 /sql/CMakeLists.txt
parentefc235d84d0df8a9895a5ae71c829303bbd39c8f (diff)
downloadmariadb-git-a93ac8d95fd504412bd819325bfaa816e317786c.tar.gz
MDEV-16448 mysql_upgrade_service remove my.ini variables that are no more valid
MDEV-16447 incorporate Innodb slow shutdown into mysql_upgrade_service.exe
Diffstat (limited to 'sql/CMakeLists.txt')
-rw-r--r--sql/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index d85e588abeb..c6910f469f9 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -489,9 +489,11 @@ IF(WIN32)
ADD_LIBRARY(winservice STATIC winservice.c)
TARGET_LINK_LIBRARIES(winservice shell32)
+
MYSQL_ADD_EXECUTABLE(mysql_upgrade_service
mysql_upgrade_service.cc
- COMPONENT Server)
+ upgrade_conf_file.cc
+ COMPONENT Server)
TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
ENDIF(WIN32)