Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
009674dc
Commit
009674dc
authored
Nov 15, 2019
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a couple of clang-cl warnings
parent
6df0bb7d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
extra/mariabackup/backup_copy.cc
extra/mariabackup/backup_copy.cc
+1
-2
sql/mysql_install_db.cc
sql/mysql_install_db.cc
+1
-1
sql/mysql_upgrade_service.cc
sql/mysql_upgrade_service.cc
+1
-1
No files found.
extra/mariabackup/backup_copy.cc
View file @
009674dc
...
@@ -1009,7 +1009,6 @@ static int fix_win_file_permissions(const char *file)
...
@@ -1009,7 +1009,6 @@ static int fix_win_file_permissions(const char *file)
ACL
*
pOldDACL
;
ACL
*
pOldDACL
;
SECURITY_DESCRIPTOR
*
pSD
=
NULL
;
SECURITY_DESCRIPTOR
*
pSD
=
NULL
;
EXPLICIT_ACCESS
ea
=
{
0
};
EXPLICIT_ACCESS
ea
=
{
0
};
BOOL
isWellKnownSID
=
FALSE
;
PSID
pSid
=
NULL
;
PSID
pSid
=
NULL
;
GetSecurityInfo
(
hFile
,
SE_FILE_OBJECT
,
DACL_SECURITY_INFORMATION
,
NULL
,
NULL
,
GetSecurityInfo
(
hFile
,
SE_FILE_OBJECT
,
DACL_SECURITY_INFORMATION
,
NULL
,
NULL
,
...
@@ -1029,7 +1028,7 @@ static int fix_win_file_permissions(const char *file)
...
@@ -1029,7 +1028,7 @@ static int fix_win_file_permissions(const char *file)
ea
.
grfInheritance
=
CONTAINER_INHERIT_ACE
|
OBJECT_INHERIT_ACE
;
ea
.
grfInheritance
=
CONTAINER_INHERIT_ACE
|
OBJECT_INHERIT_ACE
;
ea
.
Trustee
.
TrusteeType
=
TRUSTEE_IS_UNKNOWN
;
ea
.
Trustee
.
TrusteeType
=
TRUSTEE_IS_UNKNOWN
;
ACL
*
pNewDACL
=
0
;
ACL
*
pNewDACL
=
0
;
DWORD
err
=
SetEntriesInAcl
(
1
,
&
ea
,
pOldDACL
,
&
pNewDACL
);
SetEntriesInAcl
(
1
,
&
ea
,
pOldDACL
,
&
pNewDACL
);
if
(
pNewDACL
)
if
(
pNewDACL
)
{
{
SetSecurityInfo
(
hFile
,
SE_FILE_OBJECT
,
DACL_SECURITY_INFORMATION
,
NULL
,
NULL
,
SetSecurityInfo
(
hFile
,
SE_FILE_OBJECT
,
DACL_SECURITY_INFORMATION
,
NULL
,
NULL
,
...
...
sql/mysql_install_db.cc
View file @
009674dc
...
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
...
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
die
(
"--datadir option not provided, and default datadir not found"
);
die
(
"--datadir option not provided, and default datadir not found"
);
my_print_help
(
my_long_options
);
my_print_help
(
my_long_options
);
}
}
str
ncat
(
default_datadir
,
"
\\
data"
,
sizeof
(
default_datadir
)
);
str
cat_s
(
default_datadir
,
"
\\
data"
);
opt_datadir
=
default_datadir
;
opt_datadir
=
default_datadir
;
printf
(
"Default data directory is %s
\n
"
,
opt_datadir
);
printf
(
"Default data directory is %s
\n
"
,
opt_datadir
);
}
}
...
...
sql/mysql_upgrade_service.cc
View file @
009674dc
...
@@ -513,7 +513,7 @@ int main(int argc, char **argv)
...
@@ -513,7 +513,7 @@ int main(int argc, char **argv)
die
(
"Cannot start mysqld.exe process, last error =%u"
,
GetLastError
());
die
(
"Cannot start mysqld.exe process, last error =%u"
,
GetLastError
());
}
}
char
pipe_name
[
64
];
char
pipe_name
[
64
];
snprintf
(
pipe_name
,
sizeof
(
pipe_name
),
"
\\\\
.
\\
pipe
\\
mysql_upgrade_service_%u"
,
snprintf
(
pipe_name
,
sizeof
(
pipe_name
),
"
\\\\
.
\\
pipe
\\
mysql_upgrade_service_%
l
u"
,
GetCurrentProcessId
());
GetCurrentProcessId
());
for
(;;)
for
(;;)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment