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

Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base

Browse Source 
into mdk10.(none):/home/reggie/bk/mysql-5.0-base


myisam/mi_open.c:
  Auto merged
This commit is contained in:
unknown 2005-06-10 16:45:54 -05:00
commit 9b7f8f7096
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myisam/mi_open.c
View File

@ -526,7 +526,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
share->base.max_key_length), share->base.max_key_length),
&info.lastkey,share->base.max_key_length*3+1, &info.lastkey,share->base.max_key_length*3+1,
&info.first_mbr_key, share->base.max_key_length, &info.first_mbr_key, share->base.max_key_length,
&info.filename,strlen(org_name)+1, &info.filename,strlen(name)+1,
&info.rtree_recursion_state,have_rtree ? 1024 : 0, &info.rtree_recursion_state,have_rtree ? 1024 : 0,
NullS)) NullS))
goto err; goto err;
@ -535,7 +535,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
if (!have_rtree) if (!have_rtree)
info.rtree_recursion_state= NULL; info.rtree_recursion_state= NULL;
strmov(info.filename,org_name); strmov(info.filename,name);
memcpy(info.blobs,share->blobs,sizeof(MI_BLOB)*share->base.blobs); memcpy(info.blobs,share->blobs,sizeof(MI_BLOB)*share->base.blobs);
info.lastkey2=info.lastkey+share->base.max_key_length; info.lastkey2=info.lastkey+share->base.max_key_length;