bk commit into 5.0 tree (ingo:1.1916) BUG#5964

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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.1916 05/04/29 10:59:34 ingo@stripped +1 -0
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  After merge fix.

  sql/ha_myisammrg.cc
    1.62 05/04/29 10:59:29 ingo@stripped +1 -1
    BUG#5964 - 4.1 MERGE tables regression from 4.0
    After merge fix.

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-5000

--- 1.61/sql/ha_myisammrg.cc	Thu Apr 28 19:33:59 2005
+++ 1.62/sql/ha_myisammrg.cc	Fri Apr 29 10:59:29 2005
@@ -434,7 +434,7 @@
         as the MyISAM tables are from the same database as the MERGE table.
       */
       if ((dirname_length(buff) == dirlgt) && ! memcmp(buff, name, dirlgt))
-        table_name= tables->real_name;
+        table_name= tables->table_name;
       else
         if (! (table_name= thd->strmake(buff, length)))
           DBUG_RETURN(HA_ERR_OUT_OF_MEM);