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
45c47a04
Commit
45c47a04
authored
Jan 24, 2019
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-17401: LOAD DATA from very big file into MyISAM table results in EOF error and corrupt index
fix of incorrect 10.3 merge
parent
e9ba165b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
mysys/mf_iocache.c
mysys/mf_iocache.c
+4
-8
No files found.
mysys/mf_iocache.c
View file @
45c47a04
...
...
@@ -115,12 +115,15 @@ init_functions(IO_CACHE* info)
DBUG_ASSERT
(
!
(
info
->
myflags
&
MY_ENCRYPT
));
info
->
read_function
=
info
->
share
?
_my_b_cache_read_r
:
_my_b_cache_read
;
info
->
write_function
=
info
->
share
?
_my_b_cache_write_r
:
_my_b_cache_write
;
info
->
myflags
&=
~
MY_FULL_IO
;
break
;
case
TYPE_NOT_SET
:
DBUG_ASSERT
(
0
);
break
;
}
if
(
type
==
READ_CACHE
||
type
==
WRITE_CACHE
||
type
==
SEQ_READ_APPEND
)
info
->
myflags
|=
MY_FULL_IO
;
else
info
->
myflags
&=
~
MY_FULL_IO
;
}
...
...
@@ -297,10 +300,6 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize,
}
info
->
inited
=
info
->
aio_result
.
pending
=
0
;
#endif
if
(
type
==
READ_CACHE
||
type
==
WRITE_CACHE
||
type
==
SEQ_READ_APPEND
)
info
->
myflags
|=
MY_FULL_IO
;
else
info
->
myflags
&=
~
MY_FULL_IO
;
DBUG_RETURN
(
0
);
}
/* init_io_cache */
...
...
@@ -469,8 +468,6 @@ 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
);
/* Ensure we will read all data */
info
->
myflags
|=
MY_FULL_IO
;
/*
Trigger a new seek only if we have a valid
file handle.
...
...
@@ -485,7 +482,6 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
info
->
seek_not_done
=
1
;
}
info
->
end_of_file
=
~
(
my_off_t
)
0
;
info
->
myflags
&=
~
MY_FULL_IO
;
}
pos
=
info
->
request_pos
+
(
seek_offset
-
info
->
pos_in_file
);
if
(
type
==
WRITE_CACHE
)
...
...
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