diff options
author | unknown <ingo@mysql.com> | 2005-04-29 10:59:34 +0200 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2005-04-29 10:59:34 +0200 |
commit | c481eb3997555c0d2a01e80d3f4bfa28667a4b18 (patch) | |
tree | 91836936de8042fa57a66188ef2bbd4f4e0cae1b /sql/ha_myisammrg.cc | |
parent | f9128d95a1c51a8b899f5ea08929a237357d345c (diff) | |
download | mariadb-git-c481eb3997555c0d2a01e80d3f4bfa28667a4b18.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.cc | 2 |
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); |