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
a5285a8f
Commit
a5285a8f
authored
Jan 11, 2018
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed misleading voariable names.
parent
abb9e703
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
storage/maria/ma_blockrec.c
storage/maria/ma_blockrec.c
+9
-9
No files found.
storage/maria/ma_blockrec.c
View file @
a5285a8f
...
...
@@ -6279,8 +6279,8 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
uchar
*
buff
,
*
dir
;
uint
result
;
MARIA_PINNED_PAGE
page_link
;
enum
pagecache_page_lock
un
lock_method
;
enum
pagecache_page_pin
un
pin_method
;
enum
pagecache_page_lock
lock_method
;
enum
pagecache_page_pin
pin_method
;
my_off_t
end_of_page
;
uint
error
;
DBUG_ENTER
(
"_ma_apply_redo_insert_row_head_or_tail"
);
...
...
@@ -6308,8 +6308,8 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
fill it entirely with zeroes, then the REDO will put correct data on
it.
*/
un
lock_method
=
PAGECACHE_LOCK_WRITE
;
un
pin_method
=
PAGECACHE_PIN
;
lock_method
=
PAGECACHE_LOCK_WRITE
;
pin_method
=
PAGECACHE_PIN
;
DBUG_ASSERT
(
rownr
==
0
&&
new_page
);
if
(
rownr
!=
0
||
!
new_page
)
...
...
@@ -6324,8 +6324,8 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
}
else
{
un
lock_method
=
PAGECACHE_LOCK_LEFT_WRITELOCKED
;
un
pin_method
=
PAGECACHE_PIN_LEFT_PINNED
;
lock_method
=
PAGECACHE_LOCK_LEFT_WRITELOCKED
;
pin_method
=
PAGECACHE_PIN_LEFT_PINNED
;
share
->
pagecache
->
readwrite_flags
&=
~
MY_WME
;
buff
=
pagecache_read
(
share
->
pagecache
,
&
info
->
dfile
,
...
...
@@ -6427,11 +6427,11 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
this group, for this page, would be skipped) and unpin then.
*/
result
=
0
;
if
(
un
lock_method
==
PAGECACHE_LOCK_WRITE
&&
if
(
lock_method
==
PAGECACHE_LOCK_WRITE
&&
pagecache_write
(
share
->
pagecache
,
&
info
->
dfile
,
page
,
0
,
buff
,
PAGECACHE_PLAIN_PAGE
,
unlock_method
,
un
pin_method
,
lock_method
,
pin_method
,
PAGECACHE_WRITE_DELAY
,
&
page_link
.
link
,
LSN_IMPOSSIBLE
))
result
=
my_errno
;
...
...
@@ -6452,7 +6452,7 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
_ma_set_fatal_error
(
share
,
HA_ERR_WRONG_IN_RECORD
);
err:
error
=
my_errno
;
if
(
un
lock_method
==
PAGECACHE_LOCK_LEFT_WRITELOCKED
)
if
(
lock_method
==
PAGECACHE_LOCK_LEFT_WRITELOCKED
)
pagecache_unlock_by_link
(
share
->
pagecache
,
page_link
.
link
,
PAGECACHE_LOCK_WRITE_UNLOCK
,
PAGECACHE_UNPIN
,
LSN_IMPOSSIBLE
,
...
...
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