database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Make possible to use clang on Windows (clang-cl)

Browse Source 
-DWITH_ASAN can be used as well now, on x64

Fix many clang-cl warnings.
This commit is contained in:
Vladislav Vaintroub
2018-02-20 21:17:36 +00:00
parent 9d97e6010e
commit 56e7b7eaed
75 changed files with 215 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysql_upgrade_service.cc
View File

@ -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)