Commit 9b7f8f70 authored by unknown's avatar unknown
Browse files

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

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


myisam/mi_open.c:
  Auto merged
parents d02e86de 41bb9bf9

myisam/mi_open.c

+2 −2
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
				   share->base.max_key_length),

		       &info.lastkey,share->base.max_key_length*3+1,

		       &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,

		       NullS))

    goto err;
@@ -535,7 +535,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
  if (!have_rtree)

    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);

  info.lastkey2=info.lastkey+share->base.max_key_length;