From 1f13733b507a1c46fff0af85d8a3b71e35c17b76 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Sun, 10 Nov 2013 23:19:21 +0400 Subject: [PATCH] MDEV-5272 MTR/mysqltest overlays for included files do not work on Windows Modified according to the review comment --- client/mysqltest.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 95b0170257d..22645c89067 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -2992,9 +2992,6 @@ void open_file(const char *name) char buff[FN_REFLEN]; size_t length; const char *curname= cur_file->file_name; -#ifdef __WIN__ - fix_win_paths(curname, sizeof(curname)); -#endif DBUG_ENTER("open_file"); DBUG_PRINT("enter", ("name: %s", name)); @@ -3037,6 +3034,10 @@ void open_file(const char *name) 5.try in basedir */ +#ifdef __WIN__ + fix_win_paths(curname, sizeof(curname)); +#endif + bool in_overlay= opt_overlay_dir && !strncmp(curname, opt_overlay_dir, overlay_dir_len); bool in_suiteir= opt_overlay_dir && !in_overlay &&