Commit e465c0e0 authored by ingo@mysql.com's avatar ingo@mysql.com

BUG#5964 - 4.1 MERGE tables regression from 4.0

After merge fix.
parent de613e6b
...@@ -434,7 +434,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form, ...@@ -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. as the MyISAM tables are from the same database as the MERGE table.
*/ */
if ((dirname_length(buff) == dirlgt) && ! memcmp(buff, name, dirlgt)) if ((dirname_length(buff) == dirlgt) && ! memcmp(buff, name, dirlgt))
table_name= tables->real_name; table_name= tables->table_name;
else else
if (! (table_name= thd->strmake(buff, length))) if (! (table_name= thd->strmake(buff, length)))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment