summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authoringo@mysql.com <>2005-04-29 10:59:34 +0200
committeringo@mysql.com <>2005-04-29 10:59:34 +0200
commite465c0e0f3d605d2f0c27a3ab899afaccd252c7b (patch)
tree91836936de8042fa57a66188ef2bbd4f4e0cae1b /sql/ha_myisammrg.cc
parentde613e6b3d90e1a42b1a64f855062b534e961e5d (diff)
downloadmariadb-git-e465c0e0f3d605d2f0c27a3ab899afaccd252c7b.tar.gz
BUG#5964 - 4.1 MERGE tables regression from 4.0
After merge fix.
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 20b5ad44629..f7c0abf9810 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -434,7 +434,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form,
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);