1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-5272 MTR/mysqltest overlays for included files do not work on Windows

Browse Source 
Modified according to the review comment
This commit is contained in:
Elena Stepanova 2013-11-10 23:19:21 +04:00
parent 700397a8e2
commit 1f13733b50
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysqltest.cc
View File

@ -2992,9 +2992,6 @@ void open_file(const char *name)
char buff[FN_REFLEN]; char buff[FN_REFLEN];
size_t length; size_t length;
const char *curname= cur_file->file_name; const char *curname= cur_file->file_name;
#ifdef __WIN__
fix_win_paths(curname, sizeof(curname));
#endif
DBUG_ENTER("open_file"); DBUG_ENTER("open_file");
DBUG_PRINT("enter", ("name: %s", name)); DBUG_PRINT("enter", ("name: %s", name));
@ -3037,6 +3034,10 @@ void open_file(const char *name)
5.try in basedir 5.try in basedir
*/ */
#ifdef __WIN__
fix_win_paths(curname, sizeof(curname));
#endif
bool in_overlay= opt_overlay_dir && bool in_overlay= opt_overlay_dir &&
!strncmp(curname, opt_overlay_dir, overlay_dir_len); !strncmp(curname, opt_overlay_dir, overlay_dir_len);
bool in_suiteir= opt_overlay_dir && !in_overlay && bool in_suiteir= opt_overlay_dir && !in_overlay &&