database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge chilla.local:/home/mydev/mysql-5.0

Browse Source 
into  chilla.local:/home/mydev/mysql-5.0-ateam
This commit is contained in:
ingo@chilla.local
2006-07-06 15:59:03 +02:00
parent 4eee50de16 b21acbe089
commit 518fcc8f80
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
myisam/mi_rkey.c
View File

@ -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)) if (fast_mi_readinfo(info))
goto err; goto err;
if (share->concurrent_insert) if (share->concurrent_insert)
rw_rdlock(&share->key_root_lock[inx]); rw_rdlock(&share->key_root_lock[inx]);
@ -90,24 +91,35 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
case HA_KEY_ALG_BTREE: case HA_KEY_ALG_BTREE:
default: default:
if (!_mi_search(info, keyinfo, key_buff, use_key_length, 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 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 Note that this can only happen if we are not searching after an
exact key, because the keys are sorted according to position exact key, because the keys are sorted according to position
*/ */
if (_mi_search_next(info, keyinfo, info->lastkey, if (_mi_search_next(info, keyinfo, info->lastkey,
info->lastkey_length, info->lastkey_length,
myisam_readnext_vec[search_flag], myisam_readnext_vec[search_flag],
info->s->state.key_root[inx])) info->s->state.key_root[inx]))
break; break;
} }
} }
} }
if (share->concurrent_insert) if (share->concurrent_insert)
rw_unlock(&share->key_root_lock[inx]); rw_unlock(&share->key_root_lock[inx]);

6
sql/sql_class.cc
View File

@ -930,7 +930,7 @@ bool select_send::send_data(List<Item> &items)
Protocol *protocol= thd->protocol; Protocol *protocol= thd->protocol;
char buff[MAX_FIELD_WIDTH]; char buff[MAX_FIELD_WIDTH];
String buffer(buff, sizeof(buff), &my_charset_bin); String buffer(buff, sizeof(buff), &my_charset_bin);
DBUG_ENTER("send_data"); DBUG_ENTER("select_send::send_data");
protocol->prepare_for_resend(); protocol->prepare_for_resend();
Item *item; Item *item;
@ -1140,7 +1140,7 @@ select_export::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
bool select_export::send_data(List<Item> &items) bool select_export::send_data(List<Item> &items)
{ {
DBUG_ENTER("send_data"); DBUG_ENTER("select_export::send_data");
char buff[MAX_FIELD_WIDTH],null_buff[2],space[MAX_FIELD_WIDTH]; char buff[MAX_FIELD_WIDTH],null_buff[2],space[MAX_FIELD_WIDTH];
bool space_inited=0; bool space_inited=0;
String tmp(buff,sizeof(buff),&my_charset_bin),*res; String tmp(buff,sizeof(buff),&my_charset_bin),*res;
@ -1297,7 +1297,7 @@ bool select_dump::send_data(List<Item> &items)
String tmp(buff,sizeof(buff),&my_charset_bin),*res; String tmp(buff,sizeof(buff),&my_charset_bin),*res;
tmp.length(0); tmp.length(0);
Item *item; Item *item;
DBUG_ENTER("send_data"); DBUG_ENTER("select_dump::send_data");
if (unit->offset_limit_cnt) if (unit->offset_limit_cnt)
{ // using limit offset,count { // using limit offset,count