summaryrefslogtreecommitdiff
path: root/mysys/mf_loadpath.c
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-07-01 15:49:32 +0300
committermonty@mashka.mysql.fi <>2003-07-01 15:49:32 +0300
commita6755acb4ec4f10c1aa8915d779a139b59d3007b (patch)
treebae354dc2e20ca3c0b40b1b4c4625e5c52d4ea00 /mysys/mf_loadpath.c
parent6bc7b3a6be246f67b06c1e5e15ea0de97bf637f4 (diff)
downloadmariadb-git-a6755acb4ec4f10c1aa8915d779a139b59d3007b.tar.gz
Fix needed to support MERGE tables in different databases
Diffstat (limited to 'mysys/mf_loadpath.c')
-rw-r--r--mysys/mf_loadpath.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_loadpath.c b/mysys/mf_loadpath.c
index 291ad62e297..2c90d9f90a6 100644
--- a/mysys/mf_loadpath.c
+++ b/mysys/mf_loadpath.c
@@ -39,10 +39,10 @@ my_string my_load_path(my_string to, const char *path,
(is_prefix((gptr) path,FN_PARENTDIR)) ||
! own_path_prefix)
{
- if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)),MYF(0)))
- VOID(strcat(buff,path));
+ if (! my_getwd(buff,(uint) (FN_REFLEN+2-strlen(path)),MYF(0)))
+ VOID(strcat(buff,path+2));
else
- VOID(strmov(buff,path));
+ VOID(strmov(buff,path)); /* Return org file name */
}
else
VOID(strxmov(buff,own_path_prefix,path,NullS));