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
f230391c
Commit
f230391c
authored
May 25, 2010
by
Vasil Dimov
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1-innodb from bk-internal into my local tree
parents
f32908ea
268e3875
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
5 deletions
+21
-5
mysql-test/valgrind.supp
mysql-test/valgrind.supp
+5
-0
storage/innodb_plugin/buf/buf0buddy.c
storage/innodb_plugin/buf/buf0buddy.c
+9
-5
storage/innodb_plugin/row/row0sel.c
storage/innodb_plugin/row/row0sel.c
+7
-0
No files found.
mysql-test/valgrind.supp
View file @
f230391c
...
...
@@ -722,3 +722,8 @@
fun:pthread_create*
}
{
buf_buddy_relocate peeking (space,page) in potentially free blocks
Memcheck:Addr1
fun:buf_buddy_relocate
}
storage/innodb_plugin/buf/buf0buddy.c
View file @
f230391c
...
...
@@ -442,11 +442,15 @@ buf_buddy_relocate(
pool), so there is nothing wrong about this. The
mach_read_from_4() calls here will only trigger bogus
Valgrind memcheck warnings in UNIV_DEBUG_VALGRIND builds. */
bpage
=
buf_page_hash_get
(
mach_read_from_4
((
const
byte
*
)
src
+
FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID
),
mach_read_from_4
((
const
byte
*
)
src
+
FIL_PAGE_OFFSET
));
ulint
space
=
mach_read_from_4
(
(
const
byte
*
)
src
+
FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID
);
ulint
page_no
=
mach_read_from_4
(
(
const
byte
*
)
src
+
FIL_PAGE_OFFSET
);
/* Suppress Valgrind warnings about conditional jump
on uninitialized value. */
UNIV_MEM_VALID
(
&
space
,
sizeof
space
);
UNIV_MEM_VALID
(
&
page_no
,
sizeof
page_no
);
bpage
=
buf_page_hash_get
(
space
,
page_no
);
if
(
!
bpage
||
bpage
->
zip
.
data
!=
src
)
{
/* The block has probably been freshly
...
...
storage/innodb_plugin/row/row0sel.c
View file @
f230391c
...
...
@@ -3611,6 +3611,13 @@ shortcut_fails_too_big_rec:
trx
->
has_search_latch
=
FALSE
;
}
ut_ad
(
prebuilt
->
sql_stat_start
||
trx
->
conc_state
==
TRX_ACTIVE
);
ut_ad
(
trx
->
conc_state
==
TRX_NOT_STARTED
||
trx
->
conc_state
==
TRX_ACTIVE
);
ut_ad
(
prebuilt
->
sql_stat_start
||
prebuilt
->
select_lock_type
!=
LOCK_NONE
||
trx
->
read_view
);
trx_start_if_not_started
(
trx
);
if
(
trx
->
isolation_level
<=
TRX_ISO_READ_COMMITTED
...
...
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