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
e2e74003
Commit
e2e74003
authored
Jan 15, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.2 into bb-10.2-ext
parents
abbce9ed
3fdd3907
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
22 deletions
+26
-22
storage/innobase/btr/btr0cur.cc
storage/innobase/btr/btr0cur.cc
+26
-22
No files found.
storage/innobase/btr/btr0cur.cc
View file @
e2e74003
...
...
@@ -3,7 +3,7 @@
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc.
Copyright (c) 2012, Facebook Inc.
Copyright (c) 2015, 201
7
, MariaDB Corporation.
Copyright (c) 2015, 201
8
, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described
...
...
@@ -3692,34 +3692,38 @@ btr_cur_update_in_place(
||
row_get_rec_trx_id
(
rec
,
index
,
offsets
));
#ifdef BTR_CUR_HASH_ADAPT
if
(
block
->
index
)
{
/* TO DO: Can we skip this if none of the fields
index->search_info->curr_n_fields
are being updated? */
/* The function row_upd_changes_ord_field_binary works only
if the update vector was built for a clustered index, we must
NOT call it if index is secondary */
if
(
!
dict_index_is_clust
(
index
)
||
row_upd_changes_ord_field_binary
(
index
,
update
,
thr
,
NULL
,
NULL
))
{
/* Remove possible hash index pointer to this record */
btr_search_update_hash_on_delete
(
cursor
);
{
rw_lock_t
*
ahi_latch
=
block
->
index
?
btr_get_search_latch
(
block
->
index
)
:
NULL
;
if
(
ahi_latch
)
{
/* TO DO: Can we skip this if none of the fields
index->search_info->curr_n_fields
are being updated? */
/* The function row_upd_changes_ord_field_binary
does not work on a secondary index. */
if
(
!
dict_index_is_clust
(
index
)
||
row_upd_changes_ord_field_binary
(
index
,
update
,
thr
,
NULL
,
NULL
))
{
/* Remove possible hash index pointer
to this record */
btr_search_update_hash_on_delete
(
cursor
);
}
}
btr_search_x_lock
(
index
);
}
rw_lock_x_lock
(
ahi_latch
);
assert_block_ahi_valid
(
block
);
assert_block_ahi_valid
(
block
);
#endif
/* BTR_CUR_HASH_ADAPT */
row_upd_rec_in_place
(
rec
,
index
,
offsets
,
update
,
page_zip
);
row_upd_rec_in_place
(
rec
,
index
,
offsets
,
update
,
page_zip
);
#ifdef BTR_CUR_HASH_ADAPT
if
(
block
->
index
)
{
btr_search_x_unlock
(
index
);
if
(
ahi_latch
)
{
rw_lock_x_unlock
(
ahi_latch
);
}
}
#endif
/* BTR_CUR_HASH_ADAPT */
...
...
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