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
f78fdf66
Commit
f78fdf66
authored
Apr 13, 2006
by
svoj@april.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
parents
76a122d0
7412db5e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
4 deletions
+10
-4
myisam/mi_packrec.c
myisam/mi_packrec.c
+10
-4
No files found.
myisam/mi_packrec.c
View file @
f78fdf66
...
@@ -1158,16 +1158,22 @@ my_bool _mi_memmap_file(MI_INFO *info)
...
@@ -1158,16 +1158,22 @@ my_bool _mi_memmap_file(MI_INFO *info)
MYISAM_SHARE
*
share
=
info
->
s
;
MYISAM_SHARE
*
share
=
info
->
s
;
DBUG_ENTER
(
"mi_memmap_file"
);
DBUG_ENTER
(
"mi_memmap_file"
);
if
(
!
info
->
s
->
file_map
)
if
(
!
share
->
file_map
)
{
{
my_off_t
data_file_length
=
share
->
state
.
state
.
data_file_length
;
if
(
data_file_length
>
(
my_off_t
)
(
~
((
size_t
)
0
))
-
MEMMAP_EXTRA_MARGIN
)
{
DBUG_PRINT
(
"warning"
,
(
"File is too large for mmap"
));
DBUG_RETURN
(
0
);
}
if
(
my_seek
(
info
->
dfile
,
0L
,
MY_SEEK_END
,
MYF
(
0
))
<
if
(
my_seek
(
info
->
dfile
,
0L
,
MY_SEEK_END
,
MYF
(
0
))
<
share
->
state
.
state
.
data_file_length
+
MEMMAP_EXTRA_MARGIN
)
data_file_length
+
MEMMAP_EXTRA_MARGIN
)
{
{
DBUG_PRINT
(
"warning"
,(
"File isn't extended for memmap"
));
DBUG_PRINT
(
"warning"
,(
"File isn't extended for memmap"
));
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
file_map
=
(
byte
*
)
file_map
=
(
byte
*
)
mmap
(
0
,
share
->
state
.
state
.
data_file_length
+
MEMMAP_EXTRA_MARGIN
,
PROT_READ
,
mmap
(
0
,
data_file_length
+
MEMMAP_EXTRA_MARGIN
,
PROT_READ
,
MAP_SHARED
|
MAP_NORESERVE
,
info
->
dfile
,
0L
);
MAP_SHARED
|
MAP_NORESERVE
,
info
->
dfile
,
0L
);
if
(
file_map
==
(
byte
*
)
MAP_FAILED
)
if
(
file_map
==
(
byte
*
)
MAP_FAILED
)
{
{
...
@@ -1175,7 +1181,7 @@ my_bool _mi_memmap_file(MI_INFO *info)
...
@@ -1175,7 +1181,7 @@ my_bool _mi_memmap_file(MI_INFO *info)
my_errno
=
errno
;
my_errno
=
errno
;
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
info
->
s
->
file_map
=
file_map
;
share
->
file_map
=
file_map
;
}
}
info
->
opt_flag
|=
MEMMAP_USED
;
info
->
opt_flag
|=
MEMMAP_USED
;
info
->
read_record
=
share
->
read_record
=
_mi_read_mempack_record
;
info
->
read_record
=
share
->
read_record
=
_mi_read_mempack_record
;
...
...
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