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
9ef29c11
Commit
9ef29c11
authored
Sep 06, 2011
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1 to mysql-5.5.
parents
f73f90e4
ae59e31d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
13 deletions
+16
-13
storage/innobase/buf/buf0buddy.c
storage/innobase/buf/buf0buddy.c
+1
-1
storage/innobase/trx/trx0rec.c
storage/innobase/trx/trx0rec.c
+15
-12
No files found.
storage/innobase/buf/buf0buddy.c
View file @
9ef29c11
...
...
@@ -330,7 +330,6 @@ buf_buddy_relocate(
{
buf_page_t
*
bpage
;
const
ulint
size
=
BUF_BUDDY_LOW
<<
i
;
ullint
usec
=
ut_time_us
(
NULL
);
mutex_t
*
mutex
;
ulint
space
;
ulint
page_no
;
...
...
@@ -397,6 +396,7 @@ buf_buddy_relocate(
if
(
buf_page_can_relocate
(
bpage
))
{
/* Relocate the compressed page. */
ullint
usec
=
ut_time_us
(
NULL
);
ut_a
(
bpage
->
zip
.
data
==
src
);
memcpy
(
dst
,
src
,
size
);
bpage
->
zip
.
data
=
dst
;
...
...
storage/innobase/trx/trx0rec.c
View file @
9ef29c11
...
...
@@ -1120,7 +1120,7 @@ trx_undo_rec_get_partial_row(
/***********************************************************************//**
Erases the unused undo log page end.
@return TRUE if the page contained something, FALSE if it was empty */
static
__attribute__
((
nonnull
,
warn_unused_result
))
static
__attribute__
((
nonnull
))
ibool
trx_undo_erase_page_end
(
/*====================*/
...
...
@@ -1131,16 +1131,11 @@ trx_undo_erase_page_end(
first_free
=
mach_read_from_2
(
undo_page
+
TRX_UNDO_PAGE_HDR
+
TRX_UNDO_PAGE_FREE
);
if
(
first_free
==
TRX_UNDO_PAGE_HDR
+
TRX_UNDO_PAGE_HDR_SIZE
)
{
/* This was an empty page to begin with.
Do nothing here; the caller should free the page. */
return
(
FALSE
);
}
memset
(
undo_page
+
first_free
,
0xff
,
(
UNIV_PAGE_SIZE
-
FIL_PAGE_DATA_END
)
-
first_free
);
mlog_write_initial_log_record
(
undo_page
,
MLOG_UNDO_ERASE_END
,
mtr
);
return
(
TRU
E
);
return
(
first_free
!=
TRX_UNDO_PAGE_HDR
+
TRX_UNDO_PAGE_HDR_SIZ
E
);
}
/***********************************************************//**
...
...
@@ -1162,11 +1157,7 @@ trx_undo_parse_erase_page_end(
return
(
ptr
);
}
if
(
!
trx_undo_erase_page_end
(
page
,
mtr
))
{
/* The function trx_undo_erase_page_end() should not
have done anything to an empty page. */
ut_ad
(
0
);
}
trx_undo_erase_page_end
(
page
,
mtr
);
return
(
ptr
);
}
...
...
@@ -1311,6 +1302,18 @@ trx_undo_report_row_operation(
undo page. Discard the freshly allocated
page and return an error. */
/* When we remove a page from an undo
log, this is analogous to a
pessimistic insert in a B-tree, and we
must reserve the counterpart of the
tree latch, which is the rseg
mutex. We must commit the mini-transaction
first, because it may be holding lower-level
latches, such as SYNC_FSP and SYNC_FSP_PAGE. */
mtr_commit
(
&
mtr
);
mtr_start
(
&
mtr
);
mutex_enter
(
&
rseg
->
mutex
);
trx_undo_free_last_page
(
trx
,
undo
,
&
mtr
);
mutex_exit
(
&
rseg
->
mutex
);
...
...
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