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
5008318e
Commit
5008318e
authored
Aug 01, 2007
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge chilla.local:/home/mydev/mysql-5.0-bug29838
into chilla.local:/home/mydev/mysql-5.1-bug29838
parents
92d10ed4
209ea105
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
30 deletions
+51
-30
storage/myisam/mi_rkey.c
storage/myisam/mi_rkey.c
+51
-30
No files found.
storage/myisam/mi_rkey.c
View file @
5008318e
...
@@ -94,42 +94,63 @@ int mi_rkey(MI_INFO *info, uchar *buf, int inx, const uchar *key,
...
@@ -94,42 +94,63 @@ int mi_rkey(MI_INFO *info, uchar *buf, int inx, const uchar *key,
myisam_read_vec
[
search_flag
],
info
->
s
->
state
.
key_root
[
inx
]))
myisam_read_vec
[
search_flag
],
info
->
s
->
state
.
key_root
[
inx
]))
{
{
/*
/*
If we searching for a partial key (or using >, >=, < or <=) and
Found a key, but it might not be usable. We cannot use rows that
the data is outside of the data file, we need to continue searching
are inserted by other threads after we got our table lock
for the first key inside the data file
("concurrent inserts"). The record may not even be present yet.
Keys are inserted into the index(es) before the record is
inserted into the data file. When we got our table lock, we
saved the current data_file_length. Concurrent inserts always go
to the end of the file. So we can test if the found key
references a new record.
*/
*/
if
(
info
->
lastpos
>=
info
->
state
->
data_file_length
&&
if
(
info
->
lastpos
>=
info
->
state
->
data_file_length
)
(
search_flag
!=
HA_READ_KEY_EXACT
||
last_used_keyseg
!=
keyinfo
->
seg
+
keyinfo
->
keysegs
))
{
{
do
/* The key references a concurrently inserted record. */
if
(
search_flag
==
HA_READ_KEY_EXACT
&&
last_used_keyseg
==
keyinfo
->
seg
+
keyinfo
->
keysegs
)
{
/* Simply ignore the key if it matches exactly. (Bug #29838) */
my_errno
=
HA_ERR_KEY_NOT_FOUND
;
info
->
lastpos
=
HA_OFFSET_ERROR
;
}
else
{
{
uint
not_used
[
2
];
/*
Skip rows that are inserted by other threads since we got a lock
Note that this can only happen if we are not searching after an
full length exact key, because the keys are sorted
according to position
*/
if
(
_mi_search_next
(
info
,
keyinfo
,
info
->
lastkey
,
info
->
lastkey_length
,
myisam_readnext_vec
[
search_flag
],
info
->
s
->
state
.
key_root
[
inx
]))
break
;
/*
/*
Check that the found key does still match the search.
If searching for a partial key (or using >, >=, < or <=) and
_mi_search_next() delivers the next key regardless of its
the data is outside of the data file, we need to continue
valu
e.
searching for the first key inside the data fil
e.
*/
*/
if
(
search_flag
==
HA_READ_KEY_EXACT
&&
do
ha_key_cmp
(
keyinfo
->
seg
,
key_buff
,
info
->
lastkey
,
use_key_length
,
SEARCH_FIND
,
not_used
))
{
{
my_errno
=
HA_ERR_KEY_NOT_FOUND
;
uint
not_used
[
2
];
info
->
lastpos
=
HA_OFFSET_ERROR
;
/*
break
;
Skip rows that are inserted by other threads since we got
}
a lock. Note that this can only happen if we are not
}
while
(
info
->
lastpos
>=
info
->
state
->
data_file_length
);
searching after a full length exact key, because the keys
are sorted according to position.
*/
if
(
_mi_search_next
(
info
,
keyinfo
,
info
->
lastkey
,
info
->
lastkey_length
,
myisam_readnext_vec
[
search_flag
],
info
->
s
->
state
.
key_root
[
inx
]))
break
;
/* purecov: inspected */
/*
Check that the found key does still match the search.
_mi_search_next() delivers the next key regardless of its
value.
*/
if
(
search_flag
==
HA_READ_KEY_EXACT
&&
ha_key_cmp
(
keyinfo
->
seg
,
key_buff
,
info
->
lastkey
,
use_key_length
,
SEARCH_FIND
,
not_used
))
{
/* purecov: begin inspected */
my_errno
=
HA_ERR_KEY_NOT_FOUND
;
info
->
lastpos
=
HA_OFFSET_ERROR
;
break
;
/* purecov: end */
}
}
while
(
info
->
lastpos
>=
info
->
state
->
data_file_length
);
}
}
}
}
}
}
}
...
...
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