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
36ba2700
Commit
36ba2700
authored
Oct 17, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge naruto.:C:/cpp/bug23010/my50-bug23010
into naruto.:C:/cpp/mysql-5.0-maint
parents
3daa4565
48b71bb0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
mysys/mf_iocache.c
mysys/mf_iocache.c
+5
-1
mysys/my_seek.c
mysys/my_seek.c
+7
-2
No files found.
mysys/mf_iocache.c
View file @
36ba2700
...
...
@@ -333,7 +333,11 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
{
info
->
read_end
=
info
->
write_pos
;
info
->
end_of_file
=
my_b_tell
(
info
);
info
->
seek_not_done
=
1
;
/*
Trigger a new seek only if we have a valid
file handle.
*/
info
->
seek_not_done
=
(
info
->
file
!=
-
1
);
}
else
if
(
type
==
WRITE_CACHE
)
{
...
...
mysys/my_seek.c
View file @
36ba2700
...
...
@@ -29,8 +29,13 @@ my_off_t my_seek(File fd, my_off_t pos, int whence,
whence
,
MyFlags
));
DBUG_ASSERT
(
pos
!=
MY_FILEPOS_ERROR
);
/* safety check */
if
(
-
1
!=
fd
)
newpos
=
lseek
(
fd
,
pos
,
whence
);
/*
Make sure we are using a valid file descriptor!
*/
DBUG_ASSERT
(
fd
!=
-
1
);
newpos
=
lseek
(
fd
,
pos
,
whence
);
if
(
newpos
==
(
os_off_t
)
-
1
)
{
my_errno
=
errno
;
...
...
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