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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
5624eb79
Commit
5624eb79
authored
Dec 07, 2004
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents
13649d90
f41779fa
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
sql/log.cc
sql/log.cc
+10
-8
sql/sql_class.cc
sql/sql_class.cc
+2
-2
No files found.
sql/log.cc
View file @
5624eb79
...
...
@@ -1797,6 +1797,7 @@ bool flush_error_log()
char
err_renamed
[
FN_REFLEN
],
*
end
;
end
=
strmake
(
err_renamed
,
log_error_file
,
FN_REFLEN
-
4
);
strmov
(
end
,
"-old"
);
VOID
(
pthread_mutex_lock
(
&
LOCK_error_log
));
#ifdef __WIN__
char
err_temp
[
FN_REFLEN
+
4
];
/*
...
...
@@ -1817,7 +1818,7 @@ bool flush_error_log()
if
((
fd
=
my_open
(
err_temp
,
O_RDONLY
,
MYF
(
0
)))
>=
0
)
{
while
((
bytes
=
(
int
)
my_read
(
fd
,
(
byte
*
)
buf
,
IO_SIZE
,
MYF
(
0
)))
>
0
)
my_fwrite
(
stderr
,
(
byte
*
)
buf
,
(
uint
)
strlen
(
buf
),
MYF
(
0
));
my_fwrite
(
stderr
,
(
byte
*
)
buf
,
bytes
,
MYF
(
0
));
my_close
(
fd
,
MYF
(
0
));
}
(
void
)
my_delete
(
err_temp
,
MYF
(
0
));
...
...
@@ -1831,6 +1832,7 @@ bool flush_error_log()
else
result
=
1
;
#endif
VOID
(
pthread_mutex_unlock
(
&
LOCK_error_log
));
}
return
result
;
}
...
...
sql/sql_class.cc
View file @
5624eb79
...
...
@@ -564,7 +564,7 @@ select_export::prepare(List<Item> &list)
return
1
;
}
/* Create the file world readable */
if
((
file
=
my_create
(
path
,
0666
,
O_WRONLY
,
MYF
(
MY_WME
)))
<
0
)
if
((
file
=
my_create
(
path
,
0666
,
O_WRONLY
|
O_EXCL
,
MYF
(
MY_WME
)))
<
0
)
return
1
;
#ifdef HAVE_FCHMOD
(
void
)
fchmod
(
file
,
0666
);
// Because of umask()
...
...
@@ -803,7 +803,7 @@ select_dump::prepare(List<Item> &list __attribute__((unused)))
return
1
;
}
/* Create the file world readable */
if
((
file
=
my_create
(
path
,
0666
,
O_WRONLY
,
MYF
(
MY_WME
)))
<
0
)
if
((
file
=
my_create
(
path
,
0666
,
O_WRONLY
|
O_EXCL
,
MYF
(
MY_WME
)))
<
0
)
return
1
;
#ifdef HAVE_FCHMOD
(
void
)
fchmod
(
file
,
0666
);
// Because of umask()
...
...
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