diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-04 18:24:40 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-04 18:24:40 +0200 |
| commit | 9701759b3d9ea9fd9bee640ce27171bdd51b7e78 (patch) | |
| tree | 88ad4445989ffb68b1f3af82642749ca50372ab9 /unittest | |
| parent | d46576b35ac0775e6500ee15e828f29c74998262 (diff) | |
| download | mariadb-git-9701759b3d9ea9fd9bee640ce27171bdd51b7e78.tar.gz | |
MDEV-23043 Refactor Windows service handling
Removed the existing nt_service classes - they provide little
abstraction, and only obscure a relatively simple service handling.
This replaces by similar code inspired by MS docs samples.
Service handling is now moved into winmain.cc, which contains
the main() function for Windows.
winmain provides reporting callbacks, which should be used by external code
,to report transitions from starting to running to shutting down to stopped.
Removed a do-nothing ServiceMain thread, and the
non-working service "pause/continue". Removed a lot of #ifdef __WIN__
code from mysqld.cc
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/sql/CMakeLists.txt | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt index 987e78433a4..b7923511b97 100644 --- a/unittest/sql/CMakeLists.txt +++ b/unittest/sql/CMakeLists.txt @@ -19,15 +19,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/unittest/mytap ${CMAKE_SOURCE_DIR}/extra/yassl/include) +ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc dummy_builtins.cc) -IF(WIN32) - 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 dummy_builtins.cc) -ENDIF() TARGET_LINK_LIBRARIES(explain_filename-t sql mytap) MY_ADD_TEST(explain_filename) |