diff options
| author | unknown <reggie@mdk10.(none)> | 2005-06-09 09:00:51 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-06-09 09:00:51 -0500 |
| commit | dcfe258fd25443f2187fcc08e86f9f3a8c55affd (patch) | |
| tree | 0be1e7aca912af9031e81ffd0951c2c60e5cf52b /myisam/mi_open.c | |
| parent | d974ce936e6e54a28f08a349f865554e029c08dc (diff) | |
| download | mariadb-git-dcfe258fd25443f2187fcc08e86f9f3a8c55affd.tar.gz | |
Bug #8183 MERGE and SYM cause wrong SHOW CREATE TABLE
Without this patch, all file elements in info have symlink resolved
pathnames. This means append_create_info does not have any way
of showing the correct database name when a symlinked database is used.
myisam/mi_open.c:
store name (not symlinked resolved) instead of org_name (symlink resolved)
in info.
Diffstat (limited to 'myisam/mi_open.c')
| -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 2c85a03c6f4..e79fdb7e777 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -515,7 +515,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; @@ -524,7 +524,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; |