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
1693a57c
Commit
1693a57c
authored
Jun 06, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-maria
into desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria
parents
aa40e358
1a7ee974
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
14 deletions
+4
-14
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.c
+4
-14
No files found.
storage/maria/ma_pagecache.c
View file @
1693a57c
...
...
@@ -2689,7 +2689,6 @@ void pagecache_unlock_by_link(PAGECACHE *pagecache,
if
(
make_lock_and_pin
(
pagecache
,
block
,
lock
,
pin
))
DBUG_ASSERT
(
0
);
/* should not happend */
remove_reader
(
block
);
/*
Link the block into the LRU chain if it's the last submitted request
for the block and block will not be pinned.
...
...
@@ -2754,7 +2753,6 @@ void pagecache_unpin_by_link(PAGECACHE *pagecache,
PAGECACHE_UNPIN
))
DBUG_ASSERT
(
0
);
/* should not happend */
remove_reader
(
block
);
/*
Link the block into the LRU chain if it's the last submitted request
for the block and block will not be pinned.
...
...
@@ -2891,16 +2889,14 @@ byte *pagecache_valid_read(PAGECACHE *pagecache,
#endif
}
remove_reader
(
block
);
/*
Link the block into the LRU chain if it's the last submitted request
for the block and block will not be pinned.
See NOTE for pagecache_unlock about registering requests.
*/
if
(
pin
==
PAGECACHE_PIN_LEFT_UNPINNED
||
pin
==
PAGECACHE_UNPIN
)
{
remove_reader
(
block
);
unreg_request
(
pagecache
,
block
,
1
);
}
else
*
link
=
(
PAGECACHE_PAGE_LINK
)
block
;
...
...
@@ -3286,20 +3282,14 @@ my_bool pagecache_write_part(PAGECACHE *pagecache,
DBUG_ASSERT
(
0
);
}
/* See NOTE for pagecache_unlock about registering requests. */
if
(
pin
==
PAGECACHE_PIN_LEFT_UNPINNED
||
pin
==
PAGECACHE_UNPIN
)
{
/* Unregister the request */
DBUG_ASSERT
(
block
->
hash_link
->
requests
>
0
);
block
->
hash_link
->
requests
--
;
/* See NOTE for pagecache_unlock about registering requests. */
if
(
pin
==
PAGECACHE_PIN_LEFT_UNPINNED
||
pin
==
PAGECACHE_UNPIN
)
unreg_request
(
pagecache
,
block
,
1
);
}
else
{
if
(
pin
==
PAGECACHE_PIN_LEFT_PINNED
)
block
->
hash_link
->
requests
--
;
*
link
=
(
PAGECACHE_PAGE_LINK
)
block
;
}
if
(
block
->
status
&
PCBLOCK_ERROR
)
error
=
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