diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-12 20:13:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-12 20:13:22 +0100 |
| commit | a1e3fa93c74d50de3160545d3d9c18ca06dfcc7e (patch) | |
| tree | 17c0708a0e1cba6de7ca9ac28b2ec32d85df84ff /sql | |
| parent | f523df0a04b5c43103d9628f8c714b81b735e838 (diff) | |
| download | mariadb-git-a1e3fa93c74d50de3160545d3d9c18ca06dfcc7e.tar.gz | |
lp:893522 more problems found by PVS Studio
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/scheduler.cc | 2 | ||||
| -rw-r--r-- | sql/winservice.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index 6dd93640dc5..d301b205b58 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -514,7 +514,7 @@ static void libevent_connection_close(THD *thd) thd->killed= THD::KILL_CONNECTION; // Avoid error messages - if (thd->net.vio->sd >= 0) // not already closed + if (thd->net.vio->type != VIO_CLOSED) // not already closed { end_connection(thd); close_connection(thd, 0, 1); diff --git a/sql/winservice.c b/sql/winservice.c index 562f047fa79..3ec91c26835 100644 --- a/sql/winservice.c +++ b/sql/winservice.c @@ -116,7 +116,7 @@ int get_mysql_service_properties(const wchar_t *bin_path, wcscat(mysqld_path, L".exe"); if(wcsicmp(file_part, L"mysqld.exe") != 0 && - wcsicmp(file_part, L"mysqld.exe") != 0 && + wcsicmp(file_part, L"mysqld-debug.exe") != 0 && wcsicmp(file_part, L"mysqld-nt.exe") != 0) { /* The service executable is not mysqld. */ @@ -244,4 +244,4 @@ int get_mysql_service_properties(const wchar_t *bin_path, end: LocalFree((HLOCAL)args); return retval; -}
\ No newline at end of file +} |