diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:49:32 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:49:32 +0300 |
| commit | 14c8a0e536b6326a4ba759ba30377e8a9654b513 (patch) | |
| tree | bae354dc2e20ca3c0b40b1b4c4625e5c52d4ea00 /mysys/mf_loadpath.c | |
| parent | 48272222a7e4013073f51825f996b2c979f29b6a (diff) | |
| download | mariadb-git-14c8a0e536b6326a4ba759ba30377e8a9654b513.tar.gz | |
Fix needed to support MERGE tables in different databases
mysql-test/r/merge.result:
Test of MERGE table patch
mysql-test/t/merge.test:
Test of MERGE table patch
Diffstat (limited to 'mysys/mf_loadpath.c')
| -rw-r--r-- | mysys/mf_loadpath.c | 6 |
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)); |