bk commit into 4.1 tree (reggie:1.2285) BUG#8183

[reggie]

Below is the list of changes that have just been committed into a local
4.1 repository of reggie. When reggie does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2285 05/06/08 09:54:31 reggie@mdk10.(none) +1 -0
  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
    1.84 05/06/08 09:54:16 reggie@mdk10.(none) +2 -2
    store name (not symlinked resolved) instead of org_name (symlink resolved)
    in info.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/41test3

--- 1.83/myisam/mi_open.c	2005-03-02 03:34:56 -06:00
+++ 1.84/myisam/mi_open.c	2005-06-08 09:54:16 -05:00
@@ -515,7 +515,7 @@
 				   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 @@
   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;