1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
This commit is contained in:
ram@mysql.r18.ru 2003-02-19 21:28:47 +04:00
commit e9244b21b5
4 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
myisam/mi_open.c
View File

@ -484,6 +484,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
if (mi_open_datafile(&info, share, old_info->dfile))
goto err;
errpos=5;
have_rtree= old_info->rtree_recursion_state != NULL;
}
/* alloc and set up private structure parts */
@ -492,12 +493,15 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
&info.blobs,sizeof(MI_BLOB)*share->base.blobs,
&info.buff,(share->base.max_key_block_length*2+
share->base.max_key_length),
&info.rtree_recursion_state,have_rtree ? 1024 : 0,
&info.lastkey,share->base.max_key_length*3+1,
&info.filename,strlen(org_name)+1,
&info.rtree_recursion_state,have_rtree ? 1024 : 0,
NullS))
goto err;
errpos=6;
if (!have_rtree)
info.rtree_recursion_state= NULL;
strmov(info.filename,org_name);
memcpy(info.blobs,share->blobs,sizeof(MI_BLOB)*share->base.blobs);

2
myisam/myisamdef.h
View File

@ -272,7 +272,7 @@ struct st_myisam_info {
#ifdef THREAD
THR_LOCK_DATA lock;
#endif
uchar * rtree_recursion_state; /* For RTREE */
uchar *rtree_recursion_state; /* For RTREE */
int rtree_recursion_depth;
};

10
myisam/rt_index.c
View File

@ -53,7 +53,7 @@ static int rtree_find_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint search_flag, u
int res;
uchar *page_buf;
int k_len;
int *saved_key = (int*)(info->rtree_recursion_state + level * sizeof(int));
uint *saved_key = (uint*) (info->rtree_recursion_state) + level;
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length)))
{
@ -114,7 +114,7 @@ static int rtree_find_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint search_flag, u
uchar *after_key = rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
info->lastpos = _mi_dpos(info, 0, after_key);
info->lastkey_length = k_len + info->s->base.rec_reflength;
memcpy(info->lastkey, k, k_len + info->s->base.rec_reflength);
memcpy(info->lastkey, k, info->lastkey_length);
info->rtree_recursion_depth = level;
*saved_key = k - page_buf;
@ -205,7 +205,7 @@ int rtree_find_next(MI_INFO *info, uint keynr, uint search_flag)
info->lastpos = _mi_dpos(info, 0, after_key);
info->lastkey_length = k_len + info->s->base.rec_reflength;
memcpy(info->lastkey, key, k_len + info->s->base.rec_reflength);
memcpy(info->lastkey, key, info->lastkey_length);
*(int*)info->int_keypos = key - info->buff;
if (after_key >= info->int_maxpos)
@ -246,7 +246,7 @@ static int rtree_get_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint key_length,
int res;
uchar *page_buf;
uint k_len;
int *saved_key = (int*)(info->rtree_recursion_state + level*sizeof(int));
uint *saved_key = (uint*) (info->rtree_recursion_state) + level;
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length)))
return -1;
@ -297,7 +297,7 @@ static int rtree_get_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint key_length,
uchar *after_key = rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
info->lastpos = _mi_dpos(info, 0, after_key);
info->lastkey_length = k_len + info->s->base.rec_reflength;
memcpy(info->lastkey, k, k_len + info->s->base.rec_reflength);
memcpy(info->lastkey, k, info->lastkey_length);
info->rtree_recursion_depth = level;
*saved_key = k - page_buf;

17
myisam/rt_key.c
View File

@ -88,23 +88,10 @@ int rtree_delete_key(MI_INFO *info, uchar *page_buf, uchar *key,
int rtree_set_key_mbr(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
uint key_length, my_off_t child_page)
{
uchar *k;
uchar *last;
uint nod_flag;
if (!_mi_fetch_keypage(info, keyinfo, child_page, info->buff, 0))
goto err1;
nod_flag = mi_test_if_nod(info->buff);
return -1;
k = rt_PAGE_FIRST_KEY(info->buff, nod_flag);
last = rt_PAGE_END(info->buff);
rtree_page_mbr(info, keyinfo->seg, info->buff, key, key_length);
return 0;
err1:
return -1;
return rtree_page_mbr(info, keyinfo->seg, info->buff, key, key_length);
}