Commit 668a5a4a authored by Elena Stepanova's avatar Elena Stepanova

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

parents ef43b71f 1f13733b
...@@ -3034,6 +3034,10 @@ void open_file(const char *name) ...@@ -3034,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 &&
......
select 1; select 1;
1 1
1 1
select 2;
2
2
...@@ -5,4 +5,8 @@ ...@@ -5,4 +5,8 @@
# three times - once for the parent suite, and once for each overlay. # three times - once for the parent suite, and once for each overlay.
# even if the test files are not overlayed. # even if the test files are not overlayed.
# #
# overlay.inc is overridden in mtr2-myisam, and there is an rdiff file.
#
select 1; select 1;
source overlay.inc;
--- suite/mtr2/single.result 2013-11-10 03:58:37.000000000 +0400
+++ suite/mtr2/single.reject 2013-11-10 03:59:08.000000000 +0400
@@ -1,6 +1,6 @@
select 1;
1
1
-select 2;
-2
-2
+select 3;
+3
+3
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