diff options
| author | unknown <ingo@mysql.com> | 2006-07-04 19:10:13 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-07-04 19:10:13 +0200 |
| commit | 7bdf9e57a596b5a654e997fd9a042d45c71a073c (patch) | |
| tree | c9392d011c4ed50df63ad84d1ffc540f6d4b2f21 /myisam/mi_rkey.c | |
| parent | e93885d848ca87ed1bf8980b0e555af68fc5b9b3 (diff) | |
| parent | 51f5777676d40100ad07c0773ceb22fb6d6c7909 (diff) | |
| download | mariadb-git-7bdf9e57a596b5a654e997fd9a042d45c71a073c.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-bug14400
into mysql.com:/home/mydev/mysql-4.1-bug14400
myisam/mi_rkey.c:
Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
Manual merge
sql/sql_class.cc:
Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
Manual merge
Diffstat (limited to 'myisam/mi_rkey.c')
| -rw-r--r-- | myisam/mi_rkey.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index de4cefb19b6..98e1a0a9a26 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -68,6 +68,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, if (fast_mi_readinfo(info)) goto err; + if (share->concurrent_insert) rw_rdlock(&share->key_root_lock[inx]); @@ -89,24 +90,35 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, case HA_KEY_ALG_BTREE: default: if (!_mi_search(info, keyinfo, key_buff, use_key_length, - myisam_read_vec[search_flag], info->s->state.key_root[inx])) + myisam_read_vec[search_flag], info->s->state.key_root[inx])) { - while (info->lastpos >= info->state->data_file_length) + /* + If we are searching for an exact key (including the data pointer) + and this was added by an concurrent insert, + then the result is "key not found". + */ + if ((search_flag == HA_READ_KEY_EXACT) && + (info->lastpos >= info->state->data_file_length)) + { + my_errno= HA_ERR_KEY_NOT_FOUND; + info->lastpos= HA_OFFSET_ERROR; + } + else while (info->lastpos >= info->state->data_file_length) { /* 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 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])) + info->lastkey_length, + myisam_readnext_vec[search_flag], + info->s->state.key_root[inx])) break; } } } + if (share->concurrent_insert) rw_unlock(&share->key_root_lock[inx]); |