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
05e3b5f8
Commit
05e3b5f8
authored
Nov 06, 2006
by
thek@kpdesk.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my40-bug23010
into kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
parents
25b6da86
689a3238
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
mysys/mf_iocache.c
mysys/mf_iocache.c
+5
-1
mysys/my_seek.c
mysys/my_seek.c
+5
-0
No files found.
mysys/mf_iocache.c
View file @
05e3b5f8
...
@@ -313,7 +313,11 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
...
@@ -313,7 +313,11 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
if
(
info
->
type
==
READ_CACHE
)
if
(
info
->
type
==
READ_CACHE
)
{
{
info
->
write_end
=
info
->
write_buffer
+
info
->
buffer_length
;
info
->
write_end
=
info
->
write_buffer
+
info
->
buffer_length
;
info
->
seek_not_done
=
1
;
/*
Trigger a new seek only if we have a valid
file handle.
*/
info
->
seek_not_done
=
(
info
->
file
>=
0
);
}
}
info
->
end_of_file
=
~
(
my_off_t
)
0
;
info
->
end_of_file
=
~
(
my_off_t
)
0
;
}
}
...
...
mysys/my_seek.c
View file @
05e3b5f8
...
@@ -30,6 +30,11 @@ my_off_t my_seek(File fd, my_off_t pos, int whence,
...
@@ -30,6 +30,11 @@ my_off_t my_seek(File fd, my_off_t pos, int whence,
whence
,
MyFlags
));
whence
,
MyFlags
));
DBUG_ASSERT
(
pos
!=
MY_FILEPOS_ERROR
);
/* safety check */
DBUG_ASSERT
(
pos
!=
MY_FILEPOS_ERROR
);
/* safety check */
/*
Make sure we are using a valid file descriptor
*/
DBUG_ASSERT
(
fd
>=
0
);
newpos
=
lseek
(
fd
,
pos
,
whence
);
newpos
=
lseek
(
fd
,
pos
,
whence
);
if
(
newpos
==
(
os_off_t
)
-
1
)
if
(
newpos
==
(
os_off_t
)
-
1
)
{
{
...
...
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