diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
| commit | 56e7b7eaede52e8d2123e909d7d42220f8c63143 (patch) | |
| tree | 73e1dc4b2e53d68c3a9d5269f9140142ef08c187 /sql/mysql_upgrade_service.cc | |
| parent | 9d97e6010ebdeab0579a8371d01f34118c518b30 (diff) | |
| download | mariadb-git-56e7b7eaede52e8d2123e909d7d42220f8c63143.tar.gz | |
Make possible to use clang on Windows (clang-cl)
-DWITH_ASAN can be used as well now, on x64
Fix many clang-cl warnings.
Diffstat (limited to 'sql/mysql_upgrade_service.cc')
| -rw-r--r-- | sql/mysql_upgrade_service.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc index 2f242bebb0d..599f4a40ea0 100644 --- a/sql/mysql_upgrade_service.cc +++ b/sql/mysql_upgrade_service.cc @@ -51,7 +51,7 @@ static char *opt_service; static SC_HANDLE service; static SC_HANDLE scm; HANDLE mysqld_process; // mysqld.exe started for upgrade -DWORD initial_service_state= -1; // initial state of the service +DWORD initial_service_state= UINT_MAX; // initial state of the service HANDLE logfile_handle; /* @@ -126,7 +126,7 @@ static void die(const char *fmt, ...) Stop service that we started, if it was not initally running at program start. */ - if (initial_service_state != -1 && initial_service_state != SERVICE_RUNNING) + if (initial_service_state != UINT_MAX && initial_service_state != SERVICE_RUNNING) { SERVICE_STATUS service_status; ControlService(service, SERVICE_CONTROL_STOP, &service_status); @@ -252,7 +252,7 @@ void stop_mysqld_service() Remeber initial state of the service, we will restore it on exit. */ - if(initial_service_state == -1) + if(initial_service_state == UINT_MAX) initial_service_state= ssp.dwCurrentState; switch(ssp.dwCurrentState) |