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
86fc80d5
Commit
86fc80d5
authored
16 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria
into gbichot4.local:/home/mysql_src/mysql-maria-monty
parents
1d791be4
f0da1ea6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.c
+4
-1
No files found.
storage/maria/ma_pagecache.c
View file @
86fc80d5
...
@@ -2093,7 +2093,6 @@ restart:
...
@@ -2093,7 +2093,6 @@ restart:
PAGE_READ
:
PAGE_WAIT_TO_BE_READ
);
PAGE_READ
:
PAGE_WAIT_TO_BE_READ
);
}
}
}
}
pagecache
->
global_cache_read
++
;
}
}
else
else
{
{
...
@@ -2592,6 +2591,7 @@ static void read_block(PAGECACHE *pagecache,
...
@@ -2592,6 +2591,7 @@ static void read_block(PAGECACHE *pagecache,
DBUG_PRINT
(
"read_block"
,
DBUG_PRINT
(
"read_block"
,
(
"page to be read by primary request"
));
(
"page to be read by primary request"
));
pagecache
->
global_cache_read
++
;
/* Page is not in buffer yet, is to be read from disk */
/* Page is not in buffer yet, is to be read from disk */
pagecache_pthread_mutex_unlock
(
&
pagecache
->
cache_lock
);
pagecache_pthread_mutex_unlock
(
&
pagecache
->
cache_lock
);
/*
/*
...
@@ -3852,11 +3852,14 @@ no_key_cache:
...
@@ -3852,11 +3852,14 @@ no_key_cache:
/* Key cache is not used */
/* Key cache is not used */
if
(
write_mode
==
PAGECACHE_WRITE_DELAY
)
if
(
write_mode
==
PAGECACHE_WRITE_DELAY
)
{
{
/* We can't use mutex here as the key cache may not be initialized */
pagecache
->
global_cache_w_requests
++
;
pagecache
->
global_cache_w_requests
++
;
pagecache
->
global_cache_write
++
;
pagecache
->
global_cache_write
++
;
if
(
offset
!=
0
||
size
!=
pagecache
->
block_size
)
if
(
offset
!=
0
||
size
!=
pagecache
->
block_size
)
{
{
uchar
*
page_buffer
=
(
uchar
*
)
alloca
(
pagecache
->
block_size
);
uchar
*
page_buffer
=
(
uchar
*
)
alloca
(
pagecache
->
block_size
);
pagecache
->
global_cache_read
++
;
if
((
error
=
pagecache_fread
(
pagecache
,
file
,
if
((
error
=
pagecache_fread
(
pagecache
,
file
,
page_buffer
,
page_buffer
,
pageno
,
pageno
,
...
...
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