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
42bb0901
Commit
42bb0901
authored
19 years ago
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
012312c2
d3551745
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
myisam/mi_preload.c
myisam/mi_preload.c
+4
-4
mysql-test/r/preload.result
mysql-test/r/preload.result
+14
-14
No files found.
myisam/mi_preload.c
View file @
42bb0901
...
...
@@ -71,15 +71,15 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
if
(
flush_key_blocks
(
share
->
key_cache
,
share
->
kfile
,
FLUSH_RELEASE
))
goto
err
;
do
{
/* Read the next block of index file into the preload buffer */
if
((
my_off_t
)
length
>
(
key_file_length
-
pos
))
length
=
(
ulong
)
(
key_file_length
-
pos
);
if
(
my_pread
(
share
->
kfile
,
(
byte
*
)
buff
,
length
,
pos
,
MYF
(
MY_FAE
)))
if
(
my_pread
(
share
->
kfile
,
(
byte
*
)
buff
,
length
,
pos
,
MYF
(
MY_FAE
|
MY_FNABP
)))
goto
err
;
if
(
ignore_leaves
)
{
uchar
*
end
=
buff
+
length
;
...
...
@@ -88,7 +88,7 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
if
(
mi_test_if_nod
(
buff
))
{
if
(
key_cache_insert
(
share
->
key_cache
,
share
->
kfile
,
pos
,
DFLT_INIT_HITS
,
share
->
kfile
,
pos
,
DFLT_INIT_HITS
,
(
byte
*
)
buff
,
block_length
))
goto
err
;
}
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/preload.result
View file @
42bb0901
...
...
@@ -74,15 +74,15 @@ Table Op Msg_type Msg_text
test.t1 preload_keys status OK
show status like "key_read%";
Variable_name Value
Key_read_requests
0
Key_reads
0
Key_read_requests
581
Key_reads
581
select count(*) from t1 where b = 'test1';
count(*)
4181
show status like "key_read%";
Variable_name Value
Key_read_requests
217
Key_reads
45
Key_read_requests
798
Key_reads
581
flush tables;
flush status;
show status like "key_read%";
...
...
@@ -98,15 +98,15 @@ Table Op Msg_type Msg_text
test.t1 preload_keys status OK
show status like "key_read%";
Variable_name Value
Key_read_requests 0
Key_reads 0
Key_read_requests
1
0
Key_reads
1
0
select count(*) from t1 where b = 'test1';
count(*)
4181
show status like "key_read%";
Variable_name Value
Key_read_requests 2
1
7
Key_reads
45
Key_read_requests 2
2
7
Key_reads
52
flush tables;
flush status;
show status like "key_read%";
...
...
@@ -123,8 +123,8 @@ test.t1 preload_keys status OK
test.t2 preload_keys status OK
show status like "key_read%";
Variable_name Value
Key_read_requests
0
Key_reads
0
Key_read_requests
587
Key_reads
587
select count(*) from t1 where b = 'test1';
count(*)
4181
...
...
@@ -133,8 +133,8 @@ count(*)
2584
show status like "key_read%";
Variable_name Value
Key_read_requests
351
Key_reads
7
3
Key_read_requests
938
Key_reads
61
3
flush tables;
flush status;
show status like "key_read%";
...
...
@@ -147,8 +147,8 @@ test.t3 preload_keys error Table 'test.t3' doesn't exist
test.t2 preload_keys status OK
show status like "key_read%";
Variable_name Value
Key_read_requests
0
Key_reads
0
Key_read_requests
355
Key_reads
355
flush tables;
flush status;
show status like "key_read%";
...
...
This diff is collapsed.
Click to expand it.
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