diff options
| author | unknown <reggie@mdk10.(none)> | 2005-06-10 16:45:54 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-06-10 16:45:54 -0500 |
| commit | 9b7f8f709675d21e844b1a9ffa9ea4039b26b64c (patch) | |
| tree | c84709319fbdc119e5b416b4d3161656f72d3336 /myisam | |
| parent | d02e86de9efe1f8ffc24c1bfe35c87bc04d87907 (diff) | |
| parent | 41bb9bf94bfd5f13cc6af306283c2bf826b8fc7f (diff) | |
| download | mariadb-git-9b7f8f709675d21e844b1a9ffa9ea4039b26b64c.tar.gz | |
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
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index d65a46a92fb..456b87b7799 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -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; |