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
73ce418e
Commit
73ce418e
authored
Jul 17, 2013
by
Yoni Fogel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '6712'
parents
3404580e
4780c8bb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
storage/tokudb/ha_tokudb.cc
storage/tokudb/ha_tokudb.cc
+12
-6
No files found.
storage/tokudb/ha_tokudb.cc
View file @
73ce418e
...
@@ -4504,10 +4504,12 @@ int ha_tokudb::prepare_index_key_scan(const uchar * key, uint key_len) {
...
@@ -4504,10 +4504,12 @@ int ha_tokudb::prepare_index_key_scan(const uchar * key, uint key_len) {
pack_key
(
&
end_key
,
tokudb_active_index
,
prelocked_right_range
,
key
,
key_len
,
COL_POS_INF
);
pack_key
(
&
end_key
,
tokudb_active_index
,
prelocked_right_range
,
key
,
key_len
,
COL_POS_INF
);
prelocked_right_range_size
=
end_key
.
size
;
prelocked_right_range_size
=
end_key
.
size
;
error
=
cursor
->
c_
pre_acquire_range_lock
(
error
=
cursor
->
c_
set_bounds
(
cursor
,
cursor
,
&
start_key
,
&
start_key
,
&
end_key
&
end_key
,
true
,
(
cursor_flags
&
DB_SERIALIZABLE
)
!=
0
?
DB_NOTFOUND
:
0
);
);
if
(
error
){
if
(
error
){
...
@@ -5783,10 +5785,12 @@ int ha_tokudb::prelock_range( const key_range *start_key, const key_range *end_k
...
@@ -5783,10 +5785,12 @@ int ha_tokudb::prelock_range( const key_range *start_key, const key_range *end_k
prelocked_right_range_size
=
0
;
prelocked_right_range_size
=
0
;
}
}
error
=
cursor
->
c_
pre_acquire_range_lock
(
error
=
cursor
->
c_
set_bounds
(
cursor
,
cursor
,
start_key
?
&
start_dbt_key
:
share
->
key_file
[
tokudb_active_index
]
->
dbt_neg_infty
(),
start_key
?
&
start_dbt_key
:
share
->
key_file
[
tokudb_active_index
]
->
dbt_neg_infty
(),
end_key
?
&
end_dbt_key
:
share
->
key_file
[
tokudb_active_index
]
->
dbt_pos_infty
()
end_key
?
&
end_dbt_key
:
share
->
key_file
[
tokudb_active_index
]
->
dbt_pos_infty
(),
true
,
(
cursor_flags
&
DB_SERIALIZABLE
)
!=
0
?
DB_NOTFOUND
:
0
);
);
if
(
error
){
if
(
error
){
last_cursor_error
=
error
;
last_cursor_error
=
error
;
...
@@ -7856,10 +7860,12 @@ int ha_tokudb::tokudb_add_index(
...
@@ -7856,10 +7860,12 @@ int ha_tokudb::tokudb_add_index(
// first a global read lock on the main DB, because
// first a global read lock on the main DB, because
// we intend to scan the entire thing
// we intend to scan the entire thing
//
//
error
=
tmp_cursor
->
c_
pre_acquire_range_lock
(
error
=
tmp_cursor
->
c_
set_bounds
(
tmp_cursor
,
tmp_cursor
,
share
->
file
->
dbt_neg_infty
(),
share
->
file
->
dbt_neg_infty
(),
share
->
file
->
dbt_pos_infty
()
share
->
file
->
dbt_pos_infty
(),
true
,
0
);
);
if
(
error
)
{
goto
cleanup
;
}
if
(
error
)
{
goto
cleanup
;
}
...
...
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