mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fix clang-cl warnings
This commit is contained in:
@ -1009,7 +1009,6 @@ static int fix_win_file_permissions(const char *file)
|
||||
ACL* pOldDACL;
|
||||
SECURITY_DESCRIPTOR* pSD = NULL;
|
||||
EXPLICIT_ACCESS ea = { 0 };
|
||||
BOOL isWellKnownSID = FALSE;
|
||||
PSID pSid = NULL;
|
||||
|
||||
GetSecurityInfo(hFile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL,
|
||||
@ -1030,15 +1029,15 @@ static int fix_win_file_permissions(const char *file)
|
||||
ea.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
|
||||
ACL* pNewDACL = 0;
|
||||
DWORD err = SetEntriesInAcl(1, &ea, pOldDACL, &pNewDACL);
|
||||
if (pNewDACL)
|
||||
if (!err)
|
||||
{
|
||||
DBUG_ASSERT(pNewDACL);
|
||||
SetSecurityInfo(hFile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL,
|
||||
pNewDACL, NULL);
|
||||
LocalFree((HLOCAL)pNewDACL);
|
||||
}
|
||||
if (pSD != NULL)
|
||||
LocalFree((HLOCAL)pSD);
|
||||
if (pNewDACL != NULL)
|
||||
LocalFree((HLOCAL)pNewDACL);
|
||||
CloseHandle(hFile);
|
||||
return 0;
|
||||
}
|
||||
|
@ -90,6 +90,7 @@ static int deinitialize_plugin(void *unused)
|
||||
return plugin_deinit();
|
||||
}
|
||||
|
||||
#ifdef PLUGIN_GSSAPI
|
||||
/* system variable */
|
||||
static MYSQL_SYSVAR_STR(keytab_path, srv_keytab_path,
|
||||
PLUGIN_VAR_RQCMDARG|PLUGIN_VAR_READONLY,
|
||||
@ -97,6 +98,8 @@ static MYSQL_SYSVAR_STR(keytab_path, srv_keytab_path,
|
||||
NULL,
|
||||
NULL,
|
||||
"");
|
||||
#endif
|
||||
|
||||
static MYSQL_SYSVAR_STR(principal_name, srv_principal_name,
|
||||
PLUGIN_VAR_RQCMDARG|PLUGIN_VAR_READONLY,
|
||||
"GSSAPI target name - service principal name for Kerberos authentication.",
|
||||
|
@ -188,7 +188,7 @@ int main(int argc, char **argv)
|
||||
die("--datadir option not provided, and default datadir not found");
|
||||
my_print_help(my_long_options);
|
||||
}
|
||||
strncat(default_datadir, "\\data", sizeof(default_datadir));
|
||||
strncat_s(default_datadir, sizeof(default_datadir), "\\data", _TRUNCATE);
|
||||
opt_datadir= default_datadir;
|
||||
printf("Default data directory is %s\n",opt_datadir);
|
||||
}
|
||||
|
@ -514,7 +514,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
char pipe_name[64];
|
||||
snprintf(pipe_name, sizeof(pipe_name), "\\\\.\\pipe\\mysql_upgrade_service_%u",
|
||||
GetCurrentProcessId());
|
||||
(uint)GetCurrentProcessId());
|
||||
for (;;)
|
||||
{
|
||||
if (WaitForSingleObject(mysqld_process, 0) != WAIT_TIMEOUT)
|
||||
|
@ -371,6 +371,7 @@ IF(MSVC)
|
||||
# Temporarily disable "conversion from size_t .."
|
||||
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267")
|
||||
ENDIF()
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
|
||||
string(REPLACE "/permissive-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||
|
@ -5588,6 +5588,9 @@ AIO::AIO(
|
||||
ulint n,
|
||||
ulint segments)
|
||||
:
|
||||
#ifdef WIN_ASYNC_IO
|
||||
m_completion_port(new_completion_port()),
|
||||
#endif
|
||||
m_slots(n),
|
||||
m_n_segments(segments),
|
||||
m_n_reserved()
|
||||
@ -5595,9 +5598,6 @@ AIO::AIO(
|
||||
,m_aio_ctx(),
|
||||
m_events(m_slots.size())
|
||||
# endif /* LINUX_NATIVE_AIO */
|
||||
#ifdef WIN_ASYNC_IO
|
||||
,m_completion_port(new_completion_port())
|
||||
#endif
|
||||
{
|
||||
ut_a(n > 0);
|
||||
ut_a(m_n_segments > 0);
|
||||
|
@ -5709,6 +5709,7 @@ int spider_db_simple_action(
|
||||
#endif
|
||||
default:
|
||||
DBUG_ASSERT(0);
|
||||
error_num = 0;
|
||||
break;
|
||||
}
|
||||
DBUG_RETURN(error_num);
|
||||
|
@ -1865,7 +1865,7 @@ static enum json_types smart_read_value(json_engine_t *je,
|
||||
*value_len= (int) ((char *) je->s.c_str - *value);
|
||||
}
|
||||
|
||||
return je->value_type;
|
||||
return (enum json_types)je->value_type;
|
||||
|
||||
err_return:
|
||||
return JSV_BAD_JSON;
|
||||
|
Reference in New Issue
Block a user